diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 34d59c1..1746fb6 100644
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -1,39 +1,37 @@
 #!/usr/bin/env bash
 # Server installation
-sudo -i
-cd ~
+pushd .
 
-apt-get install git buildessential
+sudo apt-get install -y git build-essential pkg-config
 
 # Install Golang
-pushd .
-wget -q https://storage.googleapis.com/golang/go1.6.linux-amd64.tar.gz
-
 cd /usr/local
-tar -xvf ~/go1.6.linux-amd64.tar.gz
+echo 'Downloading and installing Go 1.6 ...'
+curl -s https://storage.googleapis.com/golang/go1.6.linux-amd64.tar.gz | tar xz
 export GOROOT=/usr/local/go
 echo 'export GOROOT=/usr/local/go' > /etc/profile.d/go.sh
+export GOPATH=~/go
+echo 'export GOPATH=~/go' >> /etc/profile.d/go.sh
 export PATH=$PATH:/usr/local/go/bin
 echo 'export PATH=$PATH:/usr/local/go/bin' >> /etc/profile.d/go.sh
-popd
 
 # Install zeromq
-pushd .
-wget -q http://download.zeromq.org/zeromq-4.1.4.tar.gz
+cd ~
+echo 'Downloading libsodium-1.0.10 ...'
+curl -s https://download.libsodium.org/libsodium/releases/libsodium-1.0.10.tar.gz | tar xz
+cd libsodium-1.0.10
+./configure
+make && make check && sudo make install
 
-tar -xvf zeromq-4.1.4.tar.gz
+sudo ldconfig
+
+cd ~
+echo 'Downloading zeromq-4.1.4 ...'
+curl -s http://download.zeromq.org/zeromq-4.1.4.tar.gz | tar xz
 cd zeromq-4.1.4
 ./configure
-make && make check && make install
-popd
+make && make check && sudo make install
+
+sudo ldconfig
 
-# Install Goes
-pushd .
-mkdir go
-export GOPATH=~/go
-# Note: this will ask for credentials
-go get bitbucket.org/nicdex/adaptech-goes
-cd $GOPATH/src/bitbucket.org/nicdex/adaptech-goes
-chmod +x ./scripts/*
-./scripts/install.sh
 popd
diff --git a/scripts/install.sh b/scripts/install.sh
index 86e6a77..6f1f4ce 100644
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -2,10 +2,13 @@
 # Install Goes
 go get github.com/satori/go.uuid
 go get github.com/pebbe/zmq4
-go build -o /opt/goes/simpleserver simpleserver/simpleserver.go
-cp -R scripts /opt/goes
+go build -o bin/simpleserver simpleserver/simpleserver.go
+
+sudo mkdir /opt/goes
+sudo cp -R bin /opt/goes
+sudo cp -R scripts /opt/goes
 
 # Reminders
 echo Goes reminders:
 echo - Set the system TimeZone for expected day projection
-echo '- Configure start script (/opt/goes/scripts/start.sh)'
\ No newline at end of file
+echo '- Configure start script (/opt/goes/scripts/start.sh)'
diff --git a/scripts/start.sh b/scripts/start.sh
index 71df76d..a3113c0 100644
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -1,3 +1,2 @@
 #!/usr/bin/env bash
-cd /opt/goes
-./simpleserver --db /var/events &>/var/log/goes.log &
\ No newline at end of file
+/opt/goes/bin/simpleserver --db /var/events &>/var/log/goes.log &