diff --git a/docker/files/start.sh b/docker/files/start.sh
index b2af1345f..e07a763c7 100755
--- a/docker/files/start.sh
+++ b/docker/files/start.sh
@@ -4,12 +4,12 @@ tmux -2 new-session -d -s uxbox
 
 tmux new-window -t uxbox:1 -n 'figwheel'
 tmux select-window -t uxbox:1
-tmux send-keys -t uxbox 'cd uxbox' enter C-l
+tmux send-keys -t uxbox 'cd uxbox/frontend' enter C-l
 tmux send-keys -t uxbox 'npm run figwheel' enter
 
 tmux new-window -t uxbox:2 -n 'backend'
 tmux select-window -t uxbox:2
-tmux send-keys -t uxbox 'cd uxbox-backend' enter C-l
+tmux send-keys -t uxbox 'cd uxbox/backend' enter C-l
 tmux send-keys -t uxbox 'bash ./scripts/fixtures.sh' enter
 tmux send-keys -t uxbox 'bash ./scripts/run.sh' enter
 
@@ -19,7 +19,7 @@ tmux send-keys -t uxbox 'sudo pg_ctlcluster 9.5 main start' enter
 
 tmux rename-window -t uxbox:0 'gulp'
 tmux select-window -t uxbox:0
-tmux send-keys -t uxbox 'cd uxbox' enter C-l
+tmux send-keys -t uxbox 'cd uxbox/frontend' enter C-l
 tmux send-keys -t uxbox 'if [ ! -e ./node_modules ]; then npm install; fi' enter C-l
 tmux send-keys -t uxbox 'npm run watch' enter
 
diff --git a/manage.sh b/manage.sh
index 307f70977..27197f599 100755
--- a/manage.sh
+++ b/manage.sh
@@ -14,27 +14,15 @@ function build_image {
     sudo docker build --rm=true -t $IMGNAME:$REV docker/
 }
 
-function initialize {
-    if [ ! -e ./uxbox ]; then
-        git clone git@github.com:uxbox/uxbox.git
-    fi
-
-    if [ ! -e ./uxbox-backend ]; then
-        git clone git@github.com:uxbox/uxbox-backend.git
-    fi
-}
-
 function run_image {
     kill_container
-    initialize
 
     if ! $(sudo docker images|grep $IMGNAME |grep -q $REV); then
         build_image
     fi
 
     sudo docker run -ti \
-         -v `pwd`/uxbox:/home/uxbox/uxbox  \
-         -v `pwd`/uxbox-backend:/home/uxbox/uxbox-backend \
+         -v `pwd`:/home/uxbox/uxbox  \
          -v $HOME/.m2:/home/uxbox/.m2 \
          -v $HOME/.gitconfig:/home/uxbox/.gitconfig \
          -p 3449:3449 -p 6060:6060 -p 9090:9090 $IMGNAME:$REV