diff --git a/brain/api/v1/auth.js b/brain/api/v1/auth.js
index b63d87b..cec9690 100644
--- a/brain/api/v1/auth.js
+++ b/brain/api/v1/auth.js
@@ -1,4 +1,4 @@
-import * as DataEvent from '../../utils/events/DataEvent';
+import * as DataEvent from '../../tools/events/DataEvent';
 const express = require('express');
 const router = express.Router();
 const bCrypt = require('bcrypt-nodejs');
diff --git a/brain/api/v1/pages.js b/brain/api/v1/pages.js
index 3ab5829..7220519 100644
--- a/brain/api/v1/pages.js
+++ b/brain/api/v1/pages.js
@@ -1,13 +1,13 @@
-import DateUtils from '../../utils/tools/DateUtils';
-import Pages from '../../utils/content/Pages';
-import StringUtils from '../../utils/tools/StringUtils';
-import * as DataEvent from '../../utils/events/DataEvent';
+import DateUtils from '../../../src/utils/DateUtils';
+import Pages from '../../content/Pages';
+import StringUtils from '../../../src/utils/StringUtils';
+import * as DataEvent from '../../../src/events/DataEvent';
 import sanitize from 'sanitize-html';
 import RightsManager, {
 	TASK_CREATE,
 	TASK_UPDATE,
 	OBJECT_POST
-} from '../../utils/tools/RightsManager';
+} from '../../../src/utils/RightsManager';
 const express = require('express');
 const router = express.Router();
 const multer = require('multer');
diff --git a/brain/routes/dash/index.js b/brain/routes/dash/index.js
index f84d2cb..cfb20ee 100644
--- a/brain/routes/dash/index.js
+++ b/brain/routes/dash/index.js
@@ -1,4 +1,4 @@
-import Pages from '../../utils/content/Pages';
+import Pages from '../../content/Pages';
 const express = require('express');
 const router = express.Router();
 const settings = require('../../../config/site-settings.json');
diff --git a/brain/routes/dash/posts.js b/brain/routes/dash/posts.js
index c607194..68668cd 100644
--- a/brain/routes/dash/posts.js
+++ b/brain/routes/dash/posts.js
@@ -1,10 +1,9 @@
-import DateUtils from '../../utils/tools/DateUtils';
+import DateUtils from '../../../src/utils/DateUtils';
 var express = require('express');
 var router = express.Router();
 var hljs = require('highlight.js/lib/highlight');
 var hljs_md = require('highlight.js/lib/languages/markdown');
 hljs.registerLanguage('markdown', hljs_md);
-var Sequelize = require('sequelize');
 const dateUtils = new DateUtils();
 //--------------------------
 // POSTS
diff --git a/brain/utils/events/DataEvent.js b/brain/utils/events/DataEvent.js
deleted file mode 100644
index d0b4358..0000000
--- a/brain/utils/events/DataEvent.js
+++ /dev/null
@@ -1,33 +0,0 @@
-export const AUTH_STATUS = 'authStatus';
-export const REQUEST_GOOD = 'requestGood';
-export const REQUEST_LAME = 'requestLame';
-export const IMG_REQUEST_GOOD = 'imgRequestGood';
-export const IMG_REQUEST_LAME = 'imgRequestLame';
-export const SETTINGS_LOADED = 'dataLoaded';
-export const HTML_LOADED = 'htmlLoaded';
-export const ARCHIVES_JSON_LOADED = 'archivesJSONLoaded';
-export const ARCHIVES_PAGE_LOADED = 'archivesPAGELoaded';
-export const ARCHIVES_ENTRY_LOADED = 'archivesEntryLoaded';
-export const PROJECT_UPDATED = 'projectUpdated';
-export const PROJECT_ADDED = 'projectAdded';
-export const PROJECTS_SORTED = 'projectsSorted';
-export const POST_IMAGE_ADDED = 'postImageAdded';
-export const FEATURE_IMAGE_ADDED = 'featureImageAdded';
-export const POST_ERROR = 'postError';
-export const POST_ADDED = 'postAdded';
-export const POST_UPDATED = 'postUpdated';
-export const POST_DELETED = 'postImageAdded';
-export const POSTS_SYNCED = 'postsSynced';
-export const LOCAL_DB_READY = 'localDBReady';
-export const SETTINGS_UPDATED = 'settingsUpdated';
-export const AVATAR_UPLOADED = 'avatarUploaded';
-export const SITE_BACKGROUND_UPLOADED = 'siteBackgroundUploaded';
-class DataEvent {
-	//--------------------------
-	// methods
-	//--------------------------
-	//--------------------------
-	// event handlers
-	//--------------------------
-}
-export default new DataEvent();
diff --git a/brain/utils/tools/events/AuthEvent.js b/brain/utils/tools/events/AuthEvent.js
deleted file mode 100644
index a32338c..0000000
--- a/brain/utils/tools/events/AuthEvent.js
+++ /dev/null
@@ -1,28 +0,0 @@
-export const MEMBER_STATUS = "memberStatus";
-export const LOGIN_STATUS = 'loginStatus';
-export const SUPPORTER_FOUND = 'SUPPORTER FOUND';
-export const SUPPORTER_LISTED = 'SUPPORTER LISTED';
-export const SUPPORTER_NOT_FOUND = 'SUPPORTER NOT FOUND';
-export const MEMBER_ADDED = 'MEMBER ADDED';
-export const MEMBER_NOT_ADDED = 'MEMBER NOT ADDED';
-export const MEMBER_LOGIN_GOOD = 'MEMBER LOGIN GOOD';
-export const MEMBER_LOGIN_LAME = 'MEMBER LOGIN LAME';
-export const MEMBER_EXISTS = 'USER ALREADY EXISTS';
-export const MEMBER_LOGIN_MISSING = 'Missing credentials';
-
-
-
-class AuthEvent
-{
-
-  //--------------------------
-  // methods
-  //--------------------------
-
-
-
-  //--------------------------
-  // event handlers
-  //--------------------------
-}
-export default new AuthEvent
diff --git a/brain/utils/tools/events/EditorEvent.js b/brain/utils/tools/events/EditorEvent.js
deleted file mode 100644
index 2cd24c6..0000000
--- a/brain/utils/tools/events/EditorEvent.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export const EDITOR_DELETE = 'editorDelete';
-export const EDITOR_UPLOAD_POST_IMAGE = 'editorUploadImage';
-export const EDITOR_SAVE = 'editorSave';
-export const EDITOR_UPDATE = 'editorUpdate';
-
-class EditorEvent {
-	//--------------------------
-	// methods
-	//--------------------------
-	//--------------------------
-	// event handlers
-	//--------------------------
-}
-export default new EditorEvent();
diff --git a/brain/utils/tools/events/EventEmitter.js b/brain/utils/tools/events/EventEmitter.js
deleted file mode 100644
index 56f5dfe..0000000
--- a/brain/utils/tools/events/EventEmitter.js
+++ /dev/null
@@ -1,52 +0,0 @@
-class EventEmitter {
-	//--------------------------
-	// constructor
-	//--------------------------
-	constructor() {
-		this.listeners = new Map();
-	}
-	//--------------------------
-	// methods
-	//--------------------------
-	addListener(label, callback) {
-		this.listeners.has(label) || this.listeners.set(label, []);
-		this.listeners.get(label).push(callback);
-	}
-
-	removeListener(label, callback) {
-		var isFunction = function(obj) {
-			return typeof obj == 'function' || false;
-		};
-
-		var listeners = this.listeners.get(label),
-			index;
-
-		if (listeners && listeners.length) {
-			index = listeners.reduce((i, listener, index) => {
-				return isFunction(listener) && listener === callback ? (i = index) : i;
-			}, -1);
-
-			if (index > -1) {
-				listeners.splice(index, 1);
-				this.listeners.set(label, listeners);
-				return true;
-			}
-		}
-		return false;
-	}
-
-	emitEvent(label, ...args) {
-		var listeners = this.listeners.get(label);
-		if (listeners && listeners.length) {
-			listeners.forEach(listener => {
-				listener(...args);
-			});
-			return true;
-		}
-		return false;
-	}
-	//--------------------------
-	// event handlers
-	//--------------------------
-}
-export default EventEmitter;
diff --git a/src/com/Base.js b/src/com/Base.js
index 4c7fead..32e4cd8 100644
--- a/src/com/Base.js
+++ b/src/com/Base.js
@@ -1,6 +1,6 @@
 import DataUtils, { REQUEST_TYPE_POST, CONTENT_TYPE_JSON } from '../../brain/utils/tools/DataUtils';
 import * as DataEvent from '../../brain/utils/events/DataEvent';
-import DashManager from './controllers/DashManager';
+//import DashManager from './controllers/DashManager';
 //import DBUtils from '../../../../../brain/utils/tools/DBUtils';
 
 const dataUtils = new DataUtils();
@@ -22,7 +22,7 @@ export default class Base {
 				.getElementById('login-btn')
 				.addEventListener('click', e => this.handleLogin(e));
 		} else {
-			let dm = new DashManager();
+			//let dm = new DashManager();
 		}
 	}
 	//--------------------------
diff --git a/brain/utils/events/AuthEvent.js b/src/com/events/AuthEvent.js
similarity index 100%
rename from brain/utils/events/AuthEvent.js
rename to src/com/events/AuthEvent.js
diff --git a/brain/utils/tools/events/DataEvent.js b/src/com/events/DataEvent.js
similarity index 100%
rename from brain/utils/tools/events/DataEvent.js
rename to src/com/events/DataEvent.js
diff --git a/brain/utils/events/EditorEvent.js b/src/com/events/EditorEvent.js
similarity index 100%
rename from brain/utils/events/EditorEvent.js
rename to src/com/events/EditorEvent.js
diff --git a/brain/utils/events/EventEmitter.js b/src/com/events/EventEmitter.js
similarity index 100%
rename from brain/utils/events/EventEmitter.js
rename to src/com/events/EventEmitter.js
diff --git a/brain/utils/ui/TextEditor.js b/src/com/ui/TextEditor.js
similarity index 94%
rename from brain/utils/ui/TextEditor.js
rename to src/com/ui/TextEditor.js
index 9390790..bb20d3b 100644
--- a/brain/utils/ui/TextEditor.js
+++ b/src/com/ui/TextEditor.js
@@ -1,8 +1,8 @@
-import * as DataEvent from '../events/DataEvent';
-import DateUtils from '../tools/DateUtils';
+import * as DataEvent from '../../../brain/tools/events/DataEvent';
+import DateUtils from '../../../brain/tools/utils/DateUtils';
 import { position } from 'caret-pos';
-import EventEmitter from '../events/EventEmitter';
-import * as EditorEvent from '../events/EditorEvent';
+import EventEmitter from '../../../brain/tools/events/EventEmitter';
+import * as EditorEvent from '../../../brain/tools/events/EditorEvent';
 class TextEditor extends EventEmitter {
 	/**
 	 * Text Editor UI Component
diff --git a/brain/utils/tools/DBUtils.js b/src/com/utils/DBUtils.js
similarity index 100%
rename from brain/utils/tools/DBUtils.js
rename to src/com/utils/DBUtils.js
diff --git a/brain/utils/tools/DOMUtils.js b/src/com/utils/DOMUtils.js
similarity index 100%
rename from brain/utils/tools/DOMUtils.js
rename to src/com/utils/DOMUtils.js
diff --git a/brain/utils/tools/DataUtils.js b/src/com/utils/DataUtils.js
similarity index 100%
rename from brain/utils/tools/DataUtils.js
rename to src/com/utils/DataUtils.js
diff --git a/brain/utils/tools/DateUtils.js b/src/com/utils/DateUtils.js
similarity index 100%
rename from brain/utils/tools/DateUtils.js
rename to src/com/utils/DateUtils.js
diff --git a/brain/utils/tools/RightsManager.js b/src/com/utils/RightsManager.js
similarity index 100%
rename from brain/utils/tools/RightsManager.js
rename to src/com/utils/RightsManager.js
diff --git a/brain/utils/tools/StringUtils.js b/src/com/utils/StringUtils.js
similarity index 100%
rename from brain/utils/tools/StringUtils.js
rename to src/com/utils/StringUtils.js