diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..485dee6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea
diff --git a/apps/sparkwallet/start.sh b/apps/sparkwallet/start.sh
deleted file mode 100644
index ab2bc70..0000000
--- a/apps/sparkwallet/start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-export SHARED_HTPASSWD_PATH
-export GATEKEEPER_DATAPATH
-export LIGHTNING_DATAPATH
-export APP_SCRIPT_PATH
-
-if [ "$DOCKER_MODE" = "swarm" ]; then
-  docker stack deploy -c $APP_SCRIPT_PATH/docker-compose.yaml $APP_ID
-elif [ "$DOCKER_MODE" = "compose" ]; then
-  docker-compose -f $APP_SCRIPT_PATH/docker-compose.yaml up -d --remove-orphans
-fi
diff --git a/apps/sparkwallet/stop.sh b/apps/sparkwallet/stop.sh
deleted file mode 100644
index 378ff39..0000000
--- a/apps/sparkwallet/stop.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-export SHARED_HTPASSWD_PATH
-export GATEKEEPER_DATAPATH
-export LIGHTNING_DATAPATH
-export APP_SCRIPT_PATH
-
-if [ "$DOCKER_MODE" = "swarm" ]; then
-  docker stack rm $APP_ID
-elif [ "$DOCKER_MODE" = "compose" ]; then
-  docker-compose -f $APP_SCRIPT_PATH/docker-compose.yaml down
-fi
diff --git a/apps/welcome/start.sh b/apps/welcome/start.sh
deleted file mode 100644
index 76a6fad..0000000
--- a/apps/welcome/start.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-# APP_SCRIPT_PATH
-# APP_START_SCRIPT_PATH
-# APP_ID
-
-export SHARED_HTPASSWD_PATH
-export GATEKEEPER_DATAPATH
-export APP_SCRIPT_PATH
-
-if [ "$DOCKER_MODE" = "swarm" ]; then
-  docker stack deploy -c $APP_SCRIPT_PATH/docker-compose.yaml $APP_ID
-elif [ "$DOCKER_MODE" = "compose" ]; then
-  docker-compose -f $APP_SCRIPT_PATH/docker-compose.yaml up -d --remove-orphans
-fi
diff --git a/apps/welcome/stop.sh b/apps/welcome/stop.sh
deleted file mode 100644
index a5a3b6b..0000000
--- a/apps/welcome/stop.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#echo "SCRIPT_NAME: $SCRIPT_NAME"
-#echo "SHARED_HTPASSWD_PATH: $SHARED_HTPASSWD_PATH"
-#echo "APP_SCRIPT_PATH: $APP_SCRIPT_PATH"
-#echo "APP_START_SCRIPT_PATH: $APP_START_SCRIPT_PATH"
-#echo "GATEKEEPER_DATAPATH: $GATEKEEPER_DATAPATH"
-
-if [ "$DOCKER_MODE" = "swarm" ]; then
-  docker stack rm $APP_ID
-elif [ "$DOCKER_MODE" = "compose" ]; then
-  docker-compose -f $APP_SCRIPT_PATH/docker-compose.yaml down
-fi
diff --git a/apps/sparkwallet/cookie b/sparkwallet/cookie
similarity index 100%
rename from apps/sparkwallet/cookie
rename to sparkwallet/cookie
diff --git a/apps/sparkwallet/docker-compose.yaml b/sparkwallet/docker-compose.yaml
similarity index 100%
rename from apps/sparkwallet/docker-compose.yaml
rename to sparkwallet/docker-compose.yaml
diff --git a/sparkwallet/isCoreApp b/sparkwallet/isCoreApp
new file mode 100644
index 0000000..e69de29
diff --git a/apps/sparkwallet/test.sh b/sparkwallet/test.sh
similarity index 100%
rename from apps/sparkwallet/test.sh
rename to sparkwallet/test.sh
diff --git a/apps/welcome/config.toml b/welcome/config.toml
similarity index 100%
rename from apps/welcome/config.toml
rename to welcome/config.toml
diff --git a/apps/welcome/docker-compose.yaml b/welcome/docker-compose.yaml
similarity index 100%
rename from apps/welcome/docker-compose.yaml
rename to welcome/docker-compose.yaml
diff --git a/welcome/isCoreApp b/welcome/isCoreApp
new file mode 100644
index 0000000..e69de29
diff --git a/apps/welcome/test.sh b/welcome/test.sh
similarity index 100%
rename from apps/welcome/test.sh
rename to welcome/test.sh