diff --git a/main.js b/main.js
index 9caa878..2c1935f 100644
--- a/main.js
+++ b/main.js
@@ -1,4 +1,4 @@
-var roleDispatcher = require('role/dispatcher');
+var roleDispatcher = require('role_dispatcher');
 
 module.exports.loop = function () {
     
diff --git a/role/base.js b/role_base.js
similarity index 100%
rename from role/base.js
rename to role_base.js
diff --git a/role/builder.js b/role_builder.js
similarity index 91%
rename from role/builder.js
rename to role_builder.js
index 731904c..b520045 100644
--- a/role/builder.js
+++ b/role_builder.js
@@ -1,5 +1,5 @@
-var energyUtils = require('../utils/energy');
-var roleBase = require('base');
+var energyUtils = require('util_energy');
+var roleBase = require('role_base');
 
 class roleBuilder extends roleBase{
     /** @param {Creep} creep **/
diff --git a/role/dispatcher.js b/role_dispatcher.js
similarity index 80%
rename from role/dispatcher.js
rename to role_dispatcher.js
index c829f51..c0123c3 100644
--- a/role/dispatcher.js
+++ b/role_dispatcher.js
@@ -1,8 +1,8 @@
-var roleHarvester = require('role.harvester');
-var roleUpgrader = require('role.upgrader');
-var roleBuilder = require('role.builder');
-var roleRepairer = require('role.repairer');
-var roleGuard = require('role.guard');
+var roleHarvester = require('role_harvester');
+var roleUpgrader = require('role_upgrader');
+var roleBuilder = require('role_builder');
+var roleRepairer = require('role_repairer');
+var roleGuard = require('role_guard');
 
 const roleMap = {
     harvester: roleHarvester,
diff --git a/role/guard.js b/role_guard.js
similarity index 96%
rename from role/guard.js
rename to role_guard.js
index a0e1420..23c0fe1 100644
--- a/role/guard.js
+++ b/role_guard.js
@@ -1,4 +1,4 @@
-var roleBase = require('base');
+var roleBase = require('role_base');
 
 class roleGuard extends roleBase{
     /** @param {Creep} creep **/
diff --git a/role/harvester.js b/role_harvester.js
similarity index 88%
rename from role/harvester.js
rename to role_harvester.js
index 55c8aa8..48899cd 100644
--- a/role/harvester.js
+++ b/role_harvester.js
@@ -1,5 +1,5 @@
-var energyUtils = require('../utils/energy');
-var roleBase = require('base');
+var energyUtils = require('util_energy');
+var roleBase = require('role_base');
 
 class roleHarvester extends roleBase{
     /** @param {Creep} creep **/
diff --git a/role/repairer.js b/role_repairer.js
similarity index 93%
rename from role/repairer.js
rename to role_repairer.js
index 7e98a20..b35a243 100644
--- a/role/repairer.js
+++ b/role_repairer.js
@@ -1,5 +1,5 @@
-var energyUtils = require('../utils/energy');
-var roleBase = require('base');
+var energyUtils = require('util_energy');
+var roleBase = require('role_base');
 
 class roleRepairer extends roleBase {
 	constructor(){
diff --git a/role/upgrader.js b/role_upgrader.js
similarity index 96%
rename from role/upgrader.js
rename to role_upgrader.js
index 9146dd2..6855167 100644
--- a/role/upgrader.js
+++ b/role_upgrader.js
@@ -1,4 +1,4 @@
-var roleBase = require('base');
+var roleBase = require('role_base');
 
 class roleUpgrader extends roleBase {
 	constructor(){
diff --git a/utils/energy.js b/util_energy.js
similarity index 100%
rename from utils/energy.js
rename to util_energy.js