diff --git a/cmd/balancer/balancer_test.go b/cmd/cgr-balancer/balancer_test.go
similarity index 100%
rename from cmd/balancer/balancer_test.go
rename to cmd/cgr-balancer/balancer_test.go
diff --git a/cmd/balancer/balancer.go b/cmd/cgr-balancer/cgr-balanncer.go
similarity index 100%
rename from cmd/balancer/balancer.go
rename to cmd/cgr-balancer/cgr-balanncer.go
diff --git a/cmd/balancer/http_responder.go b/cmd/cgr-balancer/http_responder.go
similarity index 100%
rename from cmd/balancer/http_responder.go
rename to cmd/cgr-balancer/http_responder.go
diff --git a/cmd/balancer/jsonrpc_responder.go b/cmd/cgr-balancer/jsonrpc_responder.go
similarity index 100%
rename from cmd/balancer/jsonrpc_responder.go
rename to cmd/cgr-balancer/jsonrpc_responder.go
diff --git a/cmd/balancer/raterlist.go b/cmd/cgr-balancer/raterlist.go
similarity index 100%
rename from cmd/balancer/raterlist.go
rename to cmd/cgr-balancer/raterlist.go
diff --git a/cmd/balancer/raterlist_test.go b/cmd/cgr-balancer/raterlist_test.go
similarity index 100%
rename from cmd/balancer/raterlist_test.go
rename to cmd/cgr-balancer/raterlist_test.go
diff --git a/cmd/balancer/registration.go b/cmd/cgr-balancer/registration.go
similarity index 100%
rename from cmd/balancer/registration.go
rename to cmd/cgr-balancer/registration.go
diff --git a/cmd/balancer/static/css/bootstrap-responsive.css b/cmd/cgr-balancer/static/css/bootstrap-responsive.css
similarity index 100%
rename from cmd/balancer/static/css/bootstrap-responsive.css
rename to cmd/cgr-balancer/static/css/bootstrap-responsive.css
diff --git a/cmd/balancer/static/css/bootstrap-responsive.min.css b/cmd/cgr-balancer/static/css/bootstrap-responsive.min.css
similarity index 100%
rename from cmd/balancer/static/css/bootstrap-responsive.min.css
rename to cmd/cgr-balancer/static/css/bootstrap-responsive.min.css
diff --git a/cmd/balancer/static/css/bootstrap.css b/cmd/cgr-balancer/static/css/bootstrap.css
similarity index 100%
rename from cmd/balancer/static/css/bootstrap.css
rename to cmd/cgr-balancer/static/css/bootstrap.css
diff --git a/cmd/balancer/static/css/bootstrap.min.css b/cmd/cgr-balancer/static/css/bootstrap.min.css
similarity index 100%
rename from cmd/balancer/static/css/bootstrap.min.css
rename to cmd/cgr-balancer/static/css/bootstrap.min.css
diff --git a/cmd/balancer/static/img/glyphicons-halflings-white.png b/cmd/cgr-balancer/static/img/glyphicons-halflings-white.png
similarity index 100%
rename from cmd/balancer/static/img/glyphicons-halflings-white.png
rename to cmd/cgr-balancer/static/img/glyphicons-halflings-white.png
diff --git a/cmd/balancer/static/img/glyphicons-halflings.png b/cmd/cgr-balancer/static/img/glyphicons-halflings.png
similarity index 100%
rename from cmd/balancer/static/img/glyphicons-halflings.png
rename to cmd/cgr-balancer/static/img/glyphicons-halflings.png
diff --git a/cmd/balancer/static/js/bootstrap.js b/cmd/cgr-balancer/static/js/bootstrap.js
similarity index 100%
rename from cmd/balancer/static/js/bootstrap.js
rename to cmd/cgr-balancer/static/js/bootstrap.js
diff --git a/cmd/balancer/static/js/bootstrap.min.js b/cmd/cgr-balancer/static/js/bootstrap.min.js
similarity index 100%
rename from cmd/balancer/static/js/bootstrap.min.js
rename to cmd/cgr-balancer/static/js/bootstrap.min.js
diff --git a/cmd/balancer/static/js/jquery-1.7.1.min.js b/cmd/cgr-balancer/static/js/jquery-1.7.1.min.js
similarity index 100%
rename from cmd/balancer/static/js/jquery-1.7.1.min.js
rename to cmd/cgr-balancer/static/js/jquery-1.7.1.min.js
diff --git a/cmd/balancer/static/js/jquery.flot.min.js b/cmd/cgr-balancer/static/js/jquery.flot.min.js
similarity index 100%
rename from cmd/balancer/static/js/jquery.flot.min.js
rename to cmd/cgr-balancer/static/js/jquery.flot.min.js
diff --git a/cmd/balancer/status_responder.go b/cmd/cgr-balancer/status_responder.go
similarity index 100%
rename from cmd/balancer/status_responder.go
rename to cmd/cgr-balancer/status_responder.go
diff --git a/cmd/balancer/templates/status.html b/cmd/cgr-balancer/templates/status.html
similarity index 100%
rename from cmd/balancer/templates/status.html
rename to cmd/cgr-balancer/templates/status.html
diff --git a/cmd/cgrates/cgrates.go b/cmd/cgr-console/cgr-console.go
similarity index 100%
rename from cmd/cgrates/cgrates.go
rename to cmd/cgr-console/cgr-console.go
diff --git a/cmd/loader/loader.go b/cmd/cgr-loader/cgr-loader.go
similarity index 100%
rename from cmd/loader/loader.go
rename to cmd/cgr-loader/cgr-loader.go
diff --git a/cmd/rater/rater.go b/cmd/cgr-rater/cgr-rater.go
similarity index 100%
rename from cmd/rater/rater.go
rename to cmd/cgr-rater/cgr-rater.go
diff --git a/cmd/rater/registration.go b/cmd/cgr-rater/registration.go
similarity index 100%
rename from cmd/rater/registration.go
rename to cmd/cgr-rater/registration.go
diff --git a/cmd/stress/balancerstress/balancerstress.go b/cmd/stress/cgr-balancerstress/cgr-balancerstress.go
similarity index 100%
rename from cmd/stress/balancerstress/balancerstress.go
rename to cmd/stress/cgr-balancerstress/cgr-balancerstress.go
diff --git a/cmd/stress/balancerstress/balancerstress.py b/cmd/stress/cgr-balancerstress/cgr-balancerstress.py
similarity index 100%
rename from cmd/stress/balancerstress/balancerstress.py
rename to cmd/stress/cgr-balancerstress/cgr-balancerstress.py
diff --git a/cmd/stress/raterstress/raterstress.go b/cmd/stress/cgr-raterstress/cgr-raterstress.go
similarity index 100%
rename from cmd/stress/raterstress/raterstress.go
rename to cmd/stress/cgr-raterstress/cgr-raterstress.go
diff --git a/cmd/stress/spansstress/spansstress.go b/cmd/stress/cgr-spansstress/cgr-spansstress.go
similarity index 100%
rename from cmd/stress/spansstress/spansstress.go
rename to cmd/stress/cgr-spansstress/cgr-spansstress.go