diff --git a/src/main/bash/binary_release/ubuntu_16_4/install_dependencies.sh b/src/main/bash/binary_release/install_dependencies_apt.sh
similarity index 100%
rename from src/main/bash/binary_release/ubuntu_16_4/install_dependencies.sh
rename to src/main/bash/binary_release/install_dependencies_apt.sh
diff --git a/src/main/bash/binary_release/ubuntu_16_4/install_dependencies_mac.sh b/src/main/bash/binary_release/install_dependencies_mac.sh
similarity index 100%
rename from src/main/bash/binary_release/ubuntu_16_4/install_dependencies_mac.sh
rename to src/main/bash/binary_release/install_dependencies_mac.sh
diff --git a/src/main/bash/binary_release/ubuntu_16_4/start_bayou.sh b/src/main/bash/binary_release/start_bayou.sh
similarity index 100%
rename from src/main/bash/binary_release/ubuntu_16_4/start_bayou.sh
rename to src/main/bash/binary_release/start_bayou.sh
diff --git a/src/main/bash/binary_release/ubuntu_16_4/synthesize.sh b/src/main/bash/binary_release/synthesize.sh
similarity index 100%
rename from src/main/bash/binary_release/ubuntu_16_4/synthesize.sh
rename to src/main/bash/binary_release/synthesize.sh
diff --git a/tool_files/bash_4_3/build_binary_release/build.sh b/tool_files/build_binary_release/build.sh
similarity index 70%
rename from tool_files/bash_4_3/build_binary_release/build.sh
rename to tool_files/build_binary_release/build.sh
index aa8c99a3..07898169 100755
--- a/tool_files/bash_4_3/build_binary_release/build.sh
+++ b/tool_files/build_binary_release/build.sh
@@ -1,4 +1,4 @@
-ls#!/bin/bash
+#!/bin/bash
 
 # Copyright 2017 Rice University
 #
@@ -14,19 +14,16 @@ ls#!/bin/bash
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apt-get update
-apt-get install openjdk-8-jdk maven zip
-
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-cd ../../maven_3_3_9/bayou
+cd ../maven_3_3_9/bayou
 mvn clean package
 cp target/bayou-1.0.0-jar-with-dependencies.jar $SCRIPT_DIR
 cp -r ../../../src/main/python $SCRIPT_DIR
 cp -r ../../../src/main/resources $SCRIPT_DIR
-cp ../../../src/main/bash/binary_release/ubuntu_16_4/*.sh $SCRIPT_DIR
+cp ../../../src/main/bash/binary_release/*.sh $SCRIPT_DIR
 cp -r target/bayou-1.0.0-jar-with-dependencies.jar $SCRIPT_DIR
 cp -r ../../../example_inputs $SCRIPT_DIR
 cd $SCRIPT_DIR
 mv bayou-1.0.0-jar-with-dependencies.jar bayou-1.0.0.jar
-zip -r bayou-1.0.0-ubuntu-16.01.zip bayou-1.0.0.jar example_inputs install_dependencies.sh start_bayou.sh synthesize.sh python resources
-rm -r bayou-1.0.0.jar example_inputs install_dependencies.sh start_bayou.sh synthesize.sh python resources 
+zip -r bayou-1.0.0.zip bayou-1.0.0.jar example_inputs install_dependencies_apt.sh install_dependencies_mac.sh start_bayou.sh synthesize.sh python resources
+rm -r bayou-1.0.0.jar example_inputs install_dependencies_apt.sh install_dependencies_mac.sh start_bayou.sh synthesize.sh python resources
diff --git a/tool_files/build_scripts/install_deps.sh b/tool_files/build_binary_release/install_deps_apt.sh
old mode 100755
new mode 100644
similarity index 93%
rename from tool_files/build_scripts/install_deps.sh
rename to tool_files/build_binary_release/install_deps_apt.sh
index b5b2d166..aea1ef55
--- a/tool_files/build_scripts/install_deps.sh
+++ b/tool_files/build_binary_release/install_deps_apt.sh
@@ -15,4 +15,4 @@
 # limitations under the License.
 
 apt-get update
-apt-get install openjdk-8-jdk maven
+apt-get install openjdk-8-jdk maven zip
diff --git a/tool_files/build_scripts/build.sh b/tool_files/build_scripts/build.sh
index 1765deb0..03a12bf1 100755
--- a/tool_files/build_scripts/build.sh
+++ b/tool_files/build_scripts/build.sh
@@ -26,7 +26,7 @@ mvn clean package
 cp target/bayou-1.0.0-jar-with-dependencies.jar $BUILD_DIR
 cp -r ../../../src/main/python $BUILD_DIR
 cp -r ../../../src/main/resources $BUILD_DIR
-cp ../../../src/main/bash/binary_release/ubuntu_16_4/*.sh $BUILD_DIR
+cp ../../../src/main/bash/binary_release/*.sh $BUILD_DIR
 cp  target/bayou-1.0.0-jar-with-dependencies.jar $BUILD_DIR
 cp -r ../../../example_inputs $BUILD_DIR
 cd $BUILD_DIR
diff --git a/tool_files/build_scripts/install_deps_mac.sh b/tool_files/build_scripts/install_deps_mac.sh
deleted file mode 100755
index e73400d6..00000000
--- a/tool_files/build_scripts/install_deps_mac.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Copyright 2017 Rice University
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-brew update
-brew cask install java
-brew install maven