diff --git a/beaconchain/beaconchain.go b/beaconchain/libs/beaconchain.go
similarity index 100%
rename from beaconchain/beaconchain.go
rename to beaconchain/libs/beaconchain.go
diff --git a/beaconchain/beaconchain_handler.go b/beaconchain/libs/beaconchain_handler.go
similarity index 100%
rename from beaconchain/beaconchain_handler.go
rename to beaconchain/libs/beaconchain_handler.go
diff --git a/beaconchain/beaconchain_test.go b/beaconchain/libs/beaconchain_test.go
similarity index 100%
rename from beaconchain/beaconchain_test.go
rename to beaconchain/libs/beaconchain_test.go
diff --git a/runbeacon/run-beacon.go b/beaconchain/main/main.go
similarity index 92%
rename from runbeacon/run-beacon.go
rename to beaconchain/main/main.go
index 9500541a9..69f78e3a8 100644
--- a/runbeacon/run-beacon.go
+++ b/beaconchain/main/main.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/harmony-one/harmony/beaconchain"
+	beaconchain "github.com/harmony-one/harmony/beaconchain/libs"
 	"github.com/harmony-one/harmony/log"
 )
 
diff --git a/deploy.sh b/deploy.sh
index bf2715403..00073b59b 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -75,7 +75,7 @@ cleanup
 echo "compiling ..."
 go build -o bin/benchmark
 go build -o bin/txgen client/txgen/main.go
-go build -o bin/beacon runbeacon/run-beacon.go
+go build -o bin/beacon beaconchain/main/main.go
 
 # Create a tmp folder for logs
 t=`date +"%Y%m%d-%H%M%S"`