diff --git a/Makefile b/Makefile
index 71b5e4ac18108df7ba05476be22706d1d5efc8be..f22ad6edf53a5438438a10ff3434edad9cda49c7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 BINARY=passbook
 
-SRC=src/
-BIN=bin/
+SRC=src
+BIN=bin
 
 VULNS=vuln-1 vuln-2 vuln-3 vuln-4 vuln-5
 
@@ -52,5 +52,5 @@ $(BIN)/%-cov: $(SRC)/%.c $(HEADERS)
 	$(CLANG) $< $(CFLAGS) $(LDFLAGS) $(COV_FLAGS) $(NO_STRICT_OVERFLOW_CFLAGS) -o $@
 
 clean:
-	rm -f $(BIN) *.profraw *.profdata
+	rm -f $(TARGETS) *.profraw *.profdata
 
diff --git a/src/eng_unimelb_setup b/eng_unimelb_setup
similarity index 100%
rename from src/eng_unimelb_setup
rename to eng_unimelb_setup
diff --git a/src/get_coverage.sh b/get_coverage.sh
similarity index 82%
rename from src/get_coverage.sh
rename to get_coverage.sh
index 6768421d37de15b266e5c92b5bd437755313a514..77238af8533cccfeacfee65ec7922ec5c0c7085d 100755
--- a/src/get_coverage.sh
+++ b/get_coverage.sh
@@ -53,11 +53,11 @@ fi
 rm -f passbook*.profraw passbook.profdata
 
 echo "First re-building to make sure -DNDEBUG is turned on..."
-rm -f passbook-cov
-CLANG=${CLANG} CFLAGS="-DNDEBUG ${CFLAGS}" make passbook-cov
+rm -f bin/passbook-cov
+CLANG=${CLANG} CFLAGS="-DNDEBUG ${CFLAGS}" make bin/passbook-cov
 
-./passbook-cov $*
+./bin/passbook-cov $*
 
 ${LLVM_PROFDATA} merge -sparse passbook*.profraw -o passbook.profdata
-${LLVM_COV} show ./passbook-cov -instr-profile=passbook.profdata
-${LLVM_COV} report ./passbook-cov -instr-profile=passbook.profdata
+${LLVM_COV} show ./bin/passbook-cov -instr-profile=passbook.profdata
+${LLVM_COV} report ./bin/passbook-cov -instr-profile=passbook.profdata