diff --git a/.travis.yml b/.travis.yml
index a65ef550..e24878d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ stages:
 cache:
   directories:
     - vendor
-    - rice-box.go
+    - lib/rice-box.go
 jobs:
   include:
   - stage: lint
diff --git a/build/build.sh b/build/build.sh
index 1619c161..eeb4411b 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -2,22 +2,19 @@
 
 set -e
 
-cd $(dirname $0)/..
+cd $(dirname $0)/../cli
 
 dep ensure -vendor-only
 
 if [ "$COMMIT_SHA" != "" ]; then
   echo "Set version to ($COMMIT_SHA)"
-  sed -i.bak "s|(untracked)|($COMMIT_SHA)|g" filebrowser.go
+  sed -i.bak "s|(untracked)|($COMMIT_SHA)|g" ../lib/filebrowser.go
 fi
 
 echo "Build cmd/filebrowser"
-cd cmd/filebrowser
-CGO_ENABLED=0 go build -a
-cd ../..
-cp cmd/filebrowser/filebrowser ./
+CGO_ENABLED=0 go build -a -o filebrowser
 
 if [ "$COMMIT_SHA" != "" ]; then
   echo "Reset version to (untracked)"
-  sed -i "s|($COMMIT_SHA)|(untracked)|g" filebrowser.go
+  sed -i "s|($COMMIT_SHA)|(untracked)|g" ../lib/filebrowser.go
 fi
diff --git a/build/build_all.sh b/build/build_all.sh
index 4c41be5e..a46308f7 100755
--- a/build/build_all.sh
+++ b/build/build_all.sh
@@ -2,8 +2,8 @@
 
 cd $(dirname $0)/..
 
-if [ -d "rice-box.go" ]; then
-  rm -rf rice-box.go
+if [ -f lib/"rice-box.go" ]; then
+  rm -rf lib/rice-box.go
 fi
 
 if [ "$USE_DOCKER" != "" ]; then
@@ -41,9 +41,10 @@ if [ "$USE_DOCKER" != "" ]; then
     for d in "dist/" "node_modules/"; do
       docker cp filebrowser-tmp:/$WDIR/frontend/$d frontend
     done
-    for d in "vendor/" "rice-box.go" "filebrowser"; do
-      docker cp filebrowser-tmp:/$WDIR/$d ./
+    for d in "vendor/" "filebrowser"; do
+      docker cp filebrowser-tmp:/$WDIR/cli/$d ./cli/
     done
+    docker cp filebrowser-tmp:/$WDIR/lib/rice-box.go ./lib/rice-box.go
   fi
   docker rm -f filebrowser-tmp
 else
diff --git a/build/build_assets.sh b/build/build_assets.sh
index bd86ac6f..73a825f8 100755
--- a/build/build_assets.sh
+++ b/build/build_assets.sh
@@ -19,4 +19,5 @@ if ! [ -x "$(command -v rice)" ]; then
 fi
 
 # Embed the assets using rice
+cd lib
 rice embed-go
diff --git a/build/push_ricebox.sh b/build/push_ricebox.sh
index c1c038d0..5ba8fbac 100755
--- a/build/push_ricebox.sh
+++ b/build/push_ricebox.sh
@@ -11,8 +11,8 @@ openssl aes-256-cbc -K $encrypted_9ca81b5594f5_key -iv $encrypted_9ca81b5594f5_i
 
 git clone git@github.com:filebrowser/caddy caddy
 cd caddy
-cp ../../rice-box.go assets/
-sed -i 's/package filebrowser/package assets/g' assets/rice-box.go
+cp ../../lib/rice-box.go assets/
+sed -i 's/package lib/package assets/g' assets/rice-box.go
 git checkout -b update-rice-box origin/master
 git config --local user.name "Filebrowser Bot"
 git config --local user.email "FilebrowserBot@users.noreply.github.com"
diff --git a/build/run_gometalinter.sh b/build/run_gometalinter.sh
index def539cf..5a755181 100755
--- a/build/run_gometalinter.sh
+++ b/build/run_gometalinter.sh
@@ -8,7 +8,7 @@ dolint='gometalinter --exclude="rice-box.go" --exclude="vendor" --deadline=300s
 
 if [ "$USE_DOCKER" != "" ]; then
   docker run --rm -itv $(pwd):/src filebrowser/dev sh -c "\
-    cp -r /src/. ./ && dep ensure -v -vendor-only && \
+    cp -r /src/. ./ && cd cli && dep ensure -v -vendor-only && \
     CGO_ENABLED=0 $dolint"
 else
   $dolint