diff --git a/.gitignore b/.gitignore
index ccfefb7..cc9903a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@
 *.srl
 *.csr
 users/
-charts/
\ No newline at end of file
diff --git a/README.md b/README.md
index d6eb514..35a6f6e 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,10 @@
 ### Quickstart
 
 1. Start Docker
-2. Run createuserspace.sh
+2. Run createprojectspace.sh
 
 ```bash
-./createuserspace.sh <username> <server_fqdn>
+./createprojectspace.sh <server_fqdn> <username>
 ```
 
 ### Update a user
diff --git a/adduser.sh b/adduser.sh
index 7f22ab1..d3c6213 100755
--- a/adduser.sh
+++ b/adduser.sh
@@ -18,7 +18,7 @@ echo "No server supplied for user $USER"
 exit 1   
 fi
 
-if [ $USER=="admin" ]; then
+if [ $USER = "admin" ]; then
 echo "Creating admin user for server $SERVER"
 fi
 
@@ -33,7 +33,7 @@ fi
 echo "Generating openssl cert"
 docker run -it -v $CERT_DIR:/$USER python:latest openssl genrsa -out /$USER/$USER.key 2048
 
-if [ $USER=="admin" ]; then
+if [ $USER = "admin" ]; then
 docker run -it -v $CERT_DIR:/$USER python:latest openssl req -new -key /$USER/$USER.key -out /$USER/$USER.csr -subj "/CN=$USER/O=system:masters"
 else
 docker run -it -v $CERT_DIR:/$USER python:latest openssl req -new -key /$USER/$USER.key -out /$USER/$USER.csr -subj "/CN=$USER/O=user"
@@ -86,7 +86,7 @@ echo "adding server to config with new context $SERVER-$USER"
 kubectl config set-cluster $SERVER --server=https://$SERVER:6443 --certificate-authority=$CA_CERT_DIR/server-ca.pem
 kubectl config set-credentials $USER-$SERVER --client-certificate=$CERT_DIR/$USER.crt --client-key=$CERT_DIR/$USER.key
 
-if [ $USER=="admin" ]; then
+if [ $USER = "admin" ]; then
 kubectl config set-context $SERVER-$USER --cluster=$SERVER --namespace=kube-system --user=$USER-$SERVER
 else
 kubectl config set-context $SERVER-$USER --cluster=$SERVER --namespace=$USER --user=$USER-$SERVER
@@ -94,7 +94,7 @@ fi
 
 kubectl config set current-context $SERVER-$USER
 
-if [ $USER=="admin" ]; then
+if [ $USER = "admin" ]; then
 echo "Admin user created, skipping namespace"
 exit 0
 fi
@@ -113,4 +113,4 @@ ssh $SERVER "kubectl apply -f $SERVER_USER_DIR/namespace.yaml"
 if [ $? -ne 0 ]; then
     echo "Failed to create namespace"
     exit 1
-fi
\ No newline at end of file
+fi
diff --git a/certsigner/.helmignore b/charts/certsigner/.helmignore
similarity index 100%
rename from certsigner/.helmignore
rename to charts/certsigner/.helmignore
diff --git a/certsigner/Chart.yaml b/charts/certsigner/Chart.yaml
similarity index 100%
rename from certsigner/Chart.yaml
rename to charts/certsigner/Chart.yaml
diff --git a/certsigner/templates/clusterrole.yaml b/charts/certsigner/templates/clusterrole.yaml
similarity index 100%
rename from certsigner/templates/clusterrole.yaml
rename to charts/certsigner/templates/clusterrole.yaml
diff --git a/certsigner/templates/clusterrolebinding.yaml b/charts/certsigner/templates/clusterrolebinding.yaml
similarity index 100%
rename from certsigner/templates/clusterrolebinding.yaml
rename to charts/certsigner/templates/clusterrolebinding.yaml
diff --git a/certsigner/templates/deploy.yaml b/charts/certsigner/templates/deploy.yaml
similarity index 100%
rename from certsigner/templates/deploy.yaml
rename to charts/certsigner/templates/deploy.yaml
diff --git a/certsigner/values.yaml b/charts/certsigner/values.yaml
similarity index 100%
rename from certsigner/values.yaml
rename to charts/certsigner/values.yaml
diff --git a/namespace/.helmignore b/charts/namespace/.helmignore
similarity index 100%
rename from namespace/.helmignore
rename to charts/namespace/.helmignore
diff --git a/namespace/Chart.yaml b/charts/namespace/Chart.yaml
similarity index 100%
rename from namespace/Chart.yaml
rename to charts/namespace/Chart.yaml
diff --git a/namespace/templates/clusterrole.yaml b/charts/namespace/templates/clusterrole.yaml
similarity index 100%
rename from namespace/templates/clusterrole.yaml
rename to charts/namespace/templates/clusterrole.yaml
diff --git a/namespace/templates/limitrange.yaml b/charts/namespace/templates/limitrange.yaml
similarity index 100%
rename from namespace/templates/limitrange.yaml
rename to charts/namespace/templates/limitrange.yaml
diff --git a/namespace/templates/namespace.yaml b/charts/namespace/templates/namespace.yaml
similarity index 100%
rename from namespace/templates/namespace.yaml
rename to charts/namespace/templates/namespace.yaml
diff --git a/namespace/templates/resourcequota.yaml b/charts/namespace/templates/resourcequota.yaml
similarity index 100%
rename from namespace/templates/resourcequota.yaml
rename to charts/namespace/templates/resourcequota.yaml
diff --git a/namespace/templates/role.yaml b/charts/namespace/templates/role.yaml
similarity index 100%
rename from namespace/templates/role.yaml
rename to charts/namespace/templates/role.yaml
diff --git a/namespace/templates/rolebinding.yaml b/charts/namespace/templates/rolebinding.yaml
similarity index 100%
rename from namespace/templates/rolebinding.yaml
rename to charts/namespace/templates/rolebinding.yaml
diff --git a/namespace/values.yaml b/charts/namespace/values.yaml
similarity index 100%
rename from namespace/values.yaml
rename to charts/namespace/values.yaml