Move modules in mods into /core

config/menu.hjson

@@ -220,7 +220,7 @@
 		}
 
 		newUserApplication: {
-			module: nua
+			module: @systemModule:nua
 			art: NUA
 			options: {
 				menuFlags: [ "noHistory" ]
@@ -341,7 +341,7 @@
 		//	Canceling this form logs off vs falling back to matrix
 		//
 		newUserApplicationSsh: {
-			module: nua
+			module: @systemModule:nua
 			art: NUA
 			fallback: logoff
 			options: {
@@ -445,7 +445,7 @@
 
 		newUserFeedbackToSysOp: {
 			desc: Feedback to SysOp
-			module: msg_area_post_fse
+			module: @systemModule:msg_area_post_fse
 			next: [
 				{
 					acs: AS2
@@ -579,7 +579,7 @@
 
 		fullLoginSequenceLastCallers: {
 			desc: Last Callers
-			module: last_callers
+			module: @systemModule:last_callers
 			art: LASTCALL
 			options: {
 				pause: true
@@ -589,7 +589,7 @@
 		}
 		fullLoginSequenceWhosOnline: {
 			desc: Who's Online
-			module: whos_online
+			module: @systemModule:whos_online
 			art: WHOSON
 			options: { pause: true }
 			next: fullLoginSequenceOnelinerz
@@ -597,7 +597,7 @@
 
 		fullLoginSequenceOnelinerz: {
 			desc: Viewing Onelinerz
-			module: onelinerz
+			module: @systemModule:onelinerz
 			next: [
 				{
 					//	calls >= 2
@@ -732,7 +732,7 @@
 
 		newScanMessageList: {
 			desc: New Messages
-			module: msg_list
+			module: @systemModule:msg_list
 			art: NEWMSGS
 			config: {
 				menuViewPost: messageAreaViewPost
@@ -772,7 +772,7 @@
 		}
 
 		newScanFileBaseList: {
-			module: file_area_list
+			module: @systemModule:file_area_list
 			desc: New Files
 			config: {
 				art: {
@@ -1019,14 +1019,14 @@
 
 		mainMenuLastCallers: {
 			desc: Last Callers
-			module: last_callers
+			module: @systemModule:last_callers
 			art: LASTCALL
 			options: { pause: true }
 		}
 
 		mainMenuWhosOnline: {
 			desc: Who's Online
-			module: whos_online
+			module: @systemModule:whos_online
 			art: WHOSON
 			options: { pause: true }
 		}
@@ -1045,7 +1045,7 @@
 
 		mainMenuUserList: {
 			desc: User Listing
-			module: user_list
+			module: @systemModule:user_list
 			art: USERLST
 			form: {
 				0: {
@@ -1166,7 +1166,7 @@
 
 		mainMenuFeedbackToSysOp: {
 			desc: Feedback to SysOp
-			module: msg_area_post_fse
+			module: @systemModule:msg_area_post_fse
 			config: {
 				art: {
 					header:				MSGEHDR
@@ -1286,7 +1286,7 @@
 
 		mainMenuOnelinerz: {
 			desc: Viewing Onelinerz
-			module: onelinerz
+			module: @systemModule:onelinerz
 			options: {
 				cls: true
 			}
@@ -1372,7 +1372,7 @@
 
 		mainMenuRumorz: {
 			desc: Rumorz
-			module: rumorz
+			module: @systemModule:rumorz
 			options: {
 				cls: true
 			}
@@ -1458,7 +1458,7 @@
 
 		ercClient: {
 			art: erc
-			module: erc_client
+			module: @systemModule:erc_client
 			config: {
 				host: localhost
         		port: 5001
@@ -1510,7 +1510,7 @@
 
 		bbsList: {
 			desc: Viewing BBS List
-			module: bbs_list
+			module: @systemModule:bbs_list
 			options: {
 				cls: true
 			}
@@ -1661,7 +1661,7 @@
 		//
 		doorPimpWars: {
 			desc: Playing PimpWars
-			module: abracadabra
+			module: @systemModule:abracadabra
 			config: {
 				name: PimpWars
 				dropFileType: DORINFO
@@ -1684,7 +1684,7 @@
 		//
 		doorTradeWars2002BBSLink: {
 			desc: Playing TW 2002 (BBSLink)
-			module: bbs_link
+			module: @systemModule:bbs_link
 			config: {
 				sysCode: XXXXXXXX
 				authCode: XXXXXXXX
@@ -1716,7 +1716,7 @@
 
 		telnetBridgeAgency: {
 			desc: Connected to HappyLand BBS
-			module: telnet_bridge
+			module: @systemModule:telnet_bridge
 			config: {
 				host: agency.bbs.geek.nz
 			}
@@ -1779,7 +1779,7 @@
 
 		messageAreaChangeCurrentConference: {
 			art: CCHANGE
-			module: msg_conf_list
+			module: @systemModule:msg_conf_list
 			form: {
 				0: {
 					mci: {
@@ -1810,7 +1810,7 @@
 		messageAreaChangeCurrentArea: {
 			//	:TODO: rename this art to ACHANGE
 			art: CHANGE
-			module: msg_area_list
+			module: @systemModule:msg_area_list
 			form: {
 				0: {
 					mci: {
@@ -1839,7 +1839,7 @@
 		}
 
 		messageAreaMessageList: {
-			module: msg_list
+			module: @systemModule:msg_list
 			art: MSGLIST
 			config: {
 				menuViewPost: messageAreaViewPost
@@ -1875,7 +1875,7 @@
 		}
 
 		messageAreaViewPost:  {
-			module: msg_area_view_fse
+			module: @systemModule:msg_area_view_fse
 			config: {
 				art: {
 					header:		MSGVHDR
@@ -1991,7 +1991,7 @@
 		}
 
 		messageAreaReplyPost: {
-			module: msg_area_post_fse
+			module: @systemModule:msg_area_post_fse
 			config: {
 				art: {
 					header:				MSGEHDR
@@ -2150,7 +2150,7 @@
 		//	:TODO: messageAreaSelect (change msg areas -> call @systemMethod -> fallback to menu
 		messageAreaNewPost: {
 			desc: Posting message,
-			module: msg_area_post_fse
+			module: @systemModule:msg_area_post_fse
 			config: {
 				art: {
 					header:				MSGEHDR
@@ -2306,7 +2306,7 @@
 
 		mailMenuCreateMessage: {
 			desc: Mailing Someone
-			module: msg_area_post_fse
+			module: @systemModule:msg_area_post_fse
 			config: {
 				art: {
 					header:				MSGEHDR
@@ -2423,7 +2423,7 @@
 		}
 
 		mailMenuInbox: {
-			module: msg_list
+			module: @systemModule:msg_list
 			art: MSGLIST
 			config: {
 				menuViewPost: messageAreaViewPost
@@ -2501,7 +2501,7 @@
 		}
 
 		fileBaseListEntries: {
-			module: file_area_list
+			module: @systemModule:file_area_list
 			desc: Browsing Files
 			config: {
 				art: {
@@ -2669,7 +2669,7 @@
 
 		fileBaseBrowseByAreaSelect: {
 			desc: Browsing File Areas
-			module: file_base_area_select
+			module: @systemModule:file_base_area_select
 			art: FAREASEL
 			form: {
 				0: {
@@ -2725,7 +2725,7 @@
 		}
 
 		fileBaseSearch: {
-			module: file_base_search
+			module: @systemModule:file_base_search
 			desc: Searching Files
 			art: FSEARCH
 			form: {
@@ -2799,7 +2799,7 @@
 
 		fileAreaFilterEditor: {
 			desc: File Filter Editor
-			module: file_area_filter_edit
+			module: @systemModule:file_area_filter_edit
 			art: FFILEDT
 			form: {
 				0: {
@@ -2889,7 +2889,7 @@
 
 		fileBaseDownloadManager: {
 			desc: Download Manager
-			module: file_base_download_manager
+			module: @systemModule:file_base_download_manager
 			config: {
 				art: {
 					queueManager: FDLMGR
@@ -2950,7 +2950,7 @@
 
 		fileBaseWebDownloadManager: {
 			desc: Web D/L Manager
-			module: file_base_web_download_manager
+			module: @systemModule:file_base_web_download_manager
 			config: {
 				art: {
 					queueManager: FWDLMGR
@@ -3017,7 +3017,7 @@
 
 		fileTransferProtocolSelection: {
 			desc: Protocol selection
-			module: file_transfer_protocol_select
+			module: @systemModule:file_transfer_protocol_select
 			art: FPROSEL
 			form: {
 				0: {
@@ -3049,7 +3049,7 @@
 
 		fileBaseUploadFiles: {
 			desc: Uploading
-			module: upload
+			module: @systemModule:upload
 			config: {
 				art: {
 					options: ULOPTS

core/abracadabra.js

@@ -1,11 +1,11 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule		= require('../../core/menu_module.js').MenuModule;
-const DropFile			= require('../../core/dropfile.js').DropFile;
-const door				= require('../../core/door.js');
-const theme				= require('../../core/theme.js');
-const ansi				= require('../../core/ansi_term.js');
+const MenuModule		= require('./menu_module.js').MenuModule;
+const DropFile			= require('./dropfile.js').DropFile;
+const door				= require('./door.js');
+const theme				= require('./theme.js');
+const ansi				= require('./ansi_term.js');
 
 const async				= require('async');
 const assert			= require('assert');

core/bbs_link.js

@@ -1,8 +1,8 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule	= require('../../core/menu_module.js').MenuModule;
-const resetScreen	= require('../../core/ansi_term.js').resetScreen;
+const MenuModule	= require('./menu_module.js').MenuModule;
+const resetScreen	= require('./ansi_term.js').resetScreen;
 
 const async			= require('async');
 const _				= require('lodash');
@@ -10,7 +10,7 @@ const http			= require('http');
 const net			= require('net');
 const crypto		= require('crypto');
 
-const packageJson 	= require('../../package.json');
+const packageJson 	= require('../package.json');
 
 /*
 	Expected configuration block:

core/bbs_list.js

@@ -2,18 +2,18 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../../core/menu_module.js').MenuModule;
+const MenuModule			= require('./menu_module.js').MenuModule;
 
 const { 
 	getModDatabasePath,
 	getTransactionDatabase
-}							= require('../../core/database.js');
+}							= require('./database.js');
 
-const ViewController		= require('../../core/view_controller.js').ViewController;
-const ansi					= require('../../core/ansi_term.js');
-const theme					= require('../../core/theme.js');
-const User					= require('../../core/user.js');
-const stringFormat			= require('../../core/string_format.js');
+const ViewController		= require('./view_controller.js').ViewController;
+const ansi					= require('./ansi_term.js');
+const theme					= require('./theme.js');
+const User					= require('./user.js');
+const stringFormat			= require('./string_format.js');
 
 //	deps
 const async 				= require('async');

core/erc_client.js

@@ -1,8 +1,8 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule	= require('../../core/menu_module.js').MenuModule;
-const stringFormat	= require('../../core/string_format.js');
+const MenuModule	= require('./menu_module.js').MenuModule;
+const stringFormat	= require('./string_format.js');
 
 //	deps
 const async			= require('async');

core/file_area_filter_edit.js

@@ -2,11 +2,11 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule					= require('../../core/menu_module.js').MenuModule;
-const ViewController				= require('../../core/view_controller.js').ViewController;
-const getSortedAvailableFileAreas	= require('../../core/file_base_area.js').getSortedAvailableFileAreas;
-const FileBaseFilters				= require('../../core/file_base_filter.js');
-const stringFormat					= require('../../core/string_format.js');
+const MenuModule					= require('./menu_module.js').MenuModule;
+const ViewController				= require('./view_controller.js').ViewController;
+const getSortedAvailableFileAreas	= require('./file_base_area.js').getSortedAvailableFileAreas;
+const FileBaseFilters				= require('./file_base_filter.js');
+const stringFormat					= require('./string_format.js');
 
 //	deps
 const async				= require('async');

core/file_area_list.js

@@ -2,23 +2,23 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../../core/menu_module.js').MenuModule;
-const ViewController		= require('../../core/view_controller.js').ViewController;
-const ansi					= require('../../core/ansi_term.js');
-const theme					= require('../../core/theme.js');
-const FileEntry				= require('../../core/file_entry.js');
-const stringFormat			= require('../../core/string_format.js');
-const FileArea				= require('../../core/file_base_area.js');
-const Errors				= require('../../core/enig_error.js').Errors;
-const ErrNotEnabled			= require('../../core/enig_error.js').ErrorReasons.NotEnabled;
-const ArchiveUtil			= require('../../core/archive_util.js');
-const Config				= require('../../core/config.js').config;
-const DownloadQueue			= require('../../core/download_queue.js');
-const FileAreaWeb			= require('../../core/file_area_web.js');
-const FileBaseFilters		= require('../../core/file_base_filter.js');
-const resolveMimeType		= require('../../core/mime_util.js').resolveMimeType;
-const isAnsi				= require('../../core/string_util.js').isAnsi;
-const controlCodesToAnsi	= require('../../core/color_codes.js').controlCodesToAnsi;
+const MenuModule			= require('./menu_module.js').MenuModule;
+const ViewController		= require('./view_controller.js').ViewController;
+const ansi					= require('./ansi_term.js');
+const theme					= require('./theme.js');
+const FileEntry				= require('./file_entry.js');
+const stringFormat			= require('./string_format.js');
+const FileArea				= require('./file_base_area.js');
+const Errors				= require('./enig_error.js').Errors;
+const ErrNotEnabled			= require('./enig_error.js').ErrorReasons.NotEnabled;
+const ArchiveUtil			= require('./archive_util.js');
+const Config				= require('./config.js').config;
+const DownloadQueue			= require('./download_queue.js');
+const FileAreaWeb			= require('./file_area_web.js');
+const FileBaseFilters		= require('./file_base_filter.js');
+const resolveMimeType		= require('./mime_util.js').resolveMimeType;
+const isAnsi				= require('./string_util.js').isAnsi;
+const controlCodesToAnsi	= require('./color_codes.js').controlCodesToAnsi;
 
 //	deps
 const async				= require('async');

core/file_base_area_select.js

@@ -2,10 +2,10 @@
 'use strict';
 
 //	enigma-bbs
-const MenuModule						= require('../../core/menu_module.js').MenuModule;
-const stringFormat						= require('../../core/string_format.js');
-const getSortedAvailableFileAreas		= require('../../core/file_base_area.js').getSortedAvailableFileAreas;
-const StatLog							= require('../../core/stat_log.js');
+const MenuModule						= require('./menu_module.js').MenuModule;
+const stringFormat						= require('./string_format.js');
+const getSortedAvailableFileAreas		= require('./file_base_area.js').getSortedAvailableFileAreas;
+const StatLog							= require('./stat_log.js');
 
 //	deps
 const async								= require('async');

core/file_base_download_manager.js

@@ -2,14 +2,14 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../../core/menu_module.js').MenuModule;
-const ViewController		= require('../../core/view_controller.js').ViewController;
-const DownloadQueue			= require('../../core/download_queue.js');
-const theme					= require('../../core/theme.js');
-const ansi					= require('../../core/ansi_term.js');
-const Errors				= require('../../core/enig_error.js').Errors;
-const stringFormat			= require('../../core/string_format.js');
-const FileAreaWeb			= require('../../core/file_area_web.js');
+const MenuModule			= require('./menu_module.js').MenuModule;
+const ViewController		= require('./view_controller.js').ViewController;
+const DownloadQueue			= require('./download_queue.js');
+const theme					= require('./theme.js');
+const ansi					= require('./ansi_term.js');
+const Errors				= require('./enig_error.js').Errors;
+const stringFormat			= require('./string_format.js');
+const FileAreaWeb			= require('./file_area_web.js');
 
 //	deps
 const async					= require('async');

core/file_base_search.js

@@ -2,10 +2,10 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule					= require('../../core/menu_module.js').MenuModule;
-const ViewController				= require('../../core/view_controller.js').ViewController;
-const getSortedAvailableFileAreas	= require('../../core/file_base_area.js').getSortedAvailableFileAreas;
-const FileBaseFilters				= require('../../core/file_base_filter.js');
+const MenuModule					= require('./menu_module.js').MenuModule;
+const ViewController				= require('./view_controller.js').ViewController;
+const getSortedAvailableFileAreas	= require('./file_base_area.js').getSortedAvailableFileAreas;
+const FileBaseFilters				= require('./file_base_filter.js');
 
 //	deps
 const async							= require('async');

core/file_base_web_download_manager.js

@@ -2,16 +2,16 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../../core/menu_module.js').MenuModule;
-const ViewController		= require('../../core/view_controller.js').ViewController;
-const DownloadQueue			= require('../../core/download_queue.js');
-const theme					= require('../../core/theme.js');
-const ansi					= require('../../core/ansi_term.js');
-const Errors				= require('../../core/enig_error.js').Errors;
-const stringFormat			= require('../../core/string_format.js');
-const FileAreaWeb			= require('../../core/file_area_web.js');
-const ErrNotEnabled			= require('../../core/enig_error.js').ErrorReasons.NotEnabled;
-const Config				= require('../../core/config.js').config;
+const MenuModule			= require('./menu_module.js').MenuModule;
+const ViewController		= require('./view_controller.js').ViewController;
+const DownloadQueue			= require('./download_queue.js');
+const theme					= require('./theme.js');
+const ansi					= require('./ansi_term.js');
+const Errors				= require('./enig_error.js').Errors;
+const stringFormat			= require('./string_format.js');
+const FileAreaWeb			= require('./file_area_web.js');
+const ErrNotEnabled			= require('./enig_error.js').ErrorReasons.NotEnabled;
+const Config				= require('./config.js').config;
 
 //	deps
 const async					= require('async');

core/file_transfer_protocol_select.js

@@ -2,10 +2,10 @@
 'use strict';
 
 //	enigma-bbs
-const MenuModule		= require('../../core/menu_module.js').MenuModule;
-const Config			= require('../../core/config.js').config;
-const stringFormat		= require('../../core/string_format.js');
-const ViewController	= require('../../core/view_controller.js').ViewController;
+const MenuModule		= require('./menu_module.js').MenuModule;
+const Config			= require('./config.js').config;
+const stringFormat		= require('./string_format.js');
+const ViewController	= require('./view_controller.js').ViewController;
 
 //	deps
 const async			= require('async');

core/last_callers.js

@@ -2,11 +2,11 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule		= require('../../core/menu_module.js').MenuModule;
-const ViewController	= require('../../core/view_controller.js').ViewController;
-const StatLog			= require('../../core/stat_log.js');
-const User				= require('../../core/user.js');
-const stringFormat		= require('../../core/string_format.js');
+const MenuModule		= require('./menu_module.js').MenuModule;
+const ViewController	= require('./view_controller.js').ViewController;
+const StatLog			= require('./stat_log.js');
+const User				= require('./user.js');
+const stringFormat		= require('./string_format.js');
 
 //	deps
 const moment			= require('moment');

core/module_util.js

@@ -102,7 +102,6 @@ function loadModulesForCategory(category, iterator, complete) {
 function getModulePaths() {
 	return [
 		Config.paths.mods,
-		Config.paths.userMods,
 		Config.paths.loginServers,
 		Config.paths.contentServers,
 		Config.paths.scannerTossers,

core/msg_area_list.js

@@ -2,12 +2,12 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../../core/menu_module.js').MenuModule;
-const ViewController		= require('../../core/view_controller.js').ViewController;
-const messageArea			= require('../../core/message_area.js');
-const displayThemeArt		= require('../../core/theme.js').displayThemeArt;
-const resetScreen			= require('../../core/ansi_term.js').resetScreen;
-const stringFormat			= require('../../core/string_format.js');
+const MenuModule			= require('./menu_module.js').MenuModule;
+const ViewController		= require('./view_controller.js').ViewController;
+const messageArea			= require('./message_area.js');
+const displayThemeArt		= require('./theme.js').displayThemeArt;
+const resetScreen			= require('./ansi_term.js').resetScreen;
+const stringFormat			= require('./string_format.js');
 
 //	deps
 const async				= require('async');

core/msg_area_post_fse.js

@@ -1,8 +1,8 @@
 /* jslint node: true */
 'use strict';
 
-const FullScreenEditorModule	= require('../../core/fse.js').FullScreenEditorModule;
-const persistMessage			= require('../../core/message_area.js').persistMessage;
+const FullScreenEditorModule	= require('./fse.js').FullScreenEditorModule;
+const persistMessage			= require('./message_area.js').persistMessage;
 
 const _							= require('lodash');
 const async					 	= require('async');

core/msg_area_reply_fse.js

@@ -1,7 +1,7 @@
 /* jslint node: true */
 'use strict';
 
-var FullScreenEditorModule		= require('../../core/fse.js').FullScreenEditorModule;
+var FullScreenEditorModule		= require('./fse.js').FullScreenEditorModule;
 
 exports.getModule				= AreaReplyFSEModule;
 

core/msg_area_view_fse.js

@@ -2,8 +2,8 @@
 'use strict';
 
 //	ENiGMA½
-const FullScreenEditorModule		= require('../../core/fse.js').FullScreenEditorModule;
-const Message						= require('../../core/message.js');
+const FullScreenEditorModule		= require('./fse.js').FullScreenEditorModule;
+const Message						= require('./message.js');
 
 //	deps
 const _							= require('lodash');

core/msg_conf_list.js

@@ -2,12 +2,12 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../../core/menu_module.js').MenuModule;
-const ViewController		= require('../../core/view_controller.js').ViewController;
-const messageArea			= require('../../core/message_area.js');
-const displayThemeArt		= require('../../core/theme.js').displayThemeArt;
-const resetScreen			= require('../../core/ansi_term.js').resetScreen;
-const stringFormat			= require('../../core/string_format.js');
+const MenuModule			= require('./menu_module.js').MenuModule;
+const ViewController		= require('./view_controller.js').ViewController;
+const messageArea			= require('./message_area.js');
+const displayThemeArt		= require('./theme.js').displayThemeArt;
+const resetScreen			= require('./ansi_term.js').resetScreen;
+const stringFormat			= require('./string_format.js');
 
 //	deps
 const async				= require('async');

core/msg_list.js

@@ -2,11 +2,11 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule					= require('../../core/menu_module.js').MenuModule;
-const ViewController				= require('../../core/view_controller.js').ViewController;
-const messageArea					= require('../../core/message_area.js');
-const stringFormat					= require('../../core/string_format.js');
-const MessageAreaConfTempSwitcher	= require('../../core/mod_mixins.js').MessageAreaConfTempSwitcher;
+const MenuModule					= require('./menu_module.js').MenuModule;
+const ViewController				= require('./view_controller.js').ViewController;
+const messageArea					= require('./message_area.js');
+const stringFormat					= require('./string_format.js');
+const MessageAreaConfTempSwitcher	= require('./mod_mixins.js').MessageAreaConfTempSwitcher;
 
 //	deps
 const async				= require('async');

core/nua.js

@@ -2,12 +2,12 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule	= require('../../core/menu_module.js').MenuModule;
-const User			= require('../../core/user.js');
-const theme			= require('../../core/theme.js');
-const login			= require('../../core/system_menu_method.js').login;
-const Config		= require('../../core/config.js').config;
-const messageArea	= require('../../core/message_area.js');
+const MenuModule	= require('./menu_module.js').MenuModule;
+const User			= require('./user.js');
+const theme			= require('./theme.js');
+const login			= require('./system_menu_method.js').login;
+const Config		= require('./config.js').config;
+const messageArea	= require('./message_area.js');
 
 exports.moduleInfo = {
 	name	: 'NUA',

core/onelinerz.js

@@ -2,17 +2,17 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../../core/menu_module.js').MenuModule;
+const MenuModule			= require('./menu_module.js').MenuModule;
 
 const {
 	getModDatabasePath,
 	getTransactionDatabase
-}							= require('../../core/database.js');
+}							= require('./database.js');
 
-const ViewController		= require('../../core/view_controller.js').ViewController;
-const theme					= require('../../core/theme.js');
-const ansi					= require('../../core/ansi_term.js');
-const stringFormat			= require('../../core/string_format.js');
+const ViewController		= require('./view_controller.js').ViewController;
+const theme					= require('./theme.js');
+const ansi					= require('./ansi_term.js');
+const stringFormat			= require('./string_format.js');
 
 //	deps
 const sqlite3				= require('sqlite3');

core/rumorz.js

@@ -2,13 +2,13 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../../core/menu_module.js').MenuModule;
-const ViewController		= require('../../core/view_controller.js').ViewController;
-const theme					= require('../../core/theme.js');
-const resetScreen			= require('../../core/ansi_term.js').resetScreen;
-const StatLog				= require('../../core/stat_log.js');
-const renderStringLength	= require('../../core/string_util.js').renderStringLength;
-const stringFormat			= require('../../core/string_format.js');
+const MenuModule			= require('./menu_module.js').MenuModule;
+const ViewController		= require('./view_controller.js').ViewController;
+const theme					= require('./theme.js');
+const resetScreen			= require('./ansi_term.js').resetScreen;
+const StatLog				= require('./stat_log.js');
+const renderStringLength	= require('./string_util.js').renderStringLength;
+const stringFormat			= require('./string_format.js');
 
 //	deps
 const async					= require('async');

core/telnet_bridge.js

@@ -2,9 +2,9 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule				= require('../../core/menu_module.js').MenuModule;
-const resetScreen				= require('../../core/ansi_term.js').resetScreen;
-const setSyncTermFontWithAlias	= require('../../core/ansi_term.js').setSyncTermFontWithAlias;
+const MenuModule				= require('./menu_module.js').MenuModule;
+const resetScreen				= require('./ansi_term.js').resetScreen;
+const setSyncTermFontWithAlias	= require('./ansi_term.js').setSyncTermFontWithAlias;
 
 //	deps
 const async			= require('async');

core/upload.js

@@ -2,20 +2,20 @@
 'use strict';
 
 //	enigma-bbs
-const MenuModule						= require('../../core/menu_module.js').MenuModule;
-const stringFormat						= require('../../core/string_format.js');
-const getSortedAvailableFileAreas		= require('../../core/file_base_area.js').getSortedAvailableFileAreas;
-const getAreaDefaultStorageDirectory	= require('../../core/file_base_area.js').getAreaDefaultStorageDirectory;
-const scanFile							= require('../../core/file_base_area.js').scanFile;
-const getFileAreaByTag					= require('../../core/file_base_area.js').getFileAreaByTag;
-const getDescFromFileName				= require('../../core/file_base_area.js').getDescFromFileName;
-const ansiGoto							= require('../../core/ansi_term.js').goto;
-const moveFileWithCollisionHandling		= require('../../core/file_util.js').moveFileWithCollisionHandling;
-const pathWithTerminatingSeparator		= require('../../core/file_util.js').pathWithTerminatingSeparator;
-const Log								= require('../../core/logger.js').log;
-const Errors							= require('../../core/enig_error.js').Errors;
-const FileEntry							= require('../../core/file_entry.js');
-const isAnsi							= require('../../core/string_util.js').isAnsi;
+const MenuModule						= require('./menu_module.js').MenuModule;
+const stringFormat						= require('./string_format.js');
+const getSortedAvailableFileAreas		= require('./file_base_area.js').getSortedAvailableFileAreas;
+const getAreaDefaultStorageDirectory	= require('./file_base_area.js').getAreaDefaultStorageDirectory;
+const scanFile							= require('./file_base_area.js').scanFile;
+const getFileAreaByTag					= require('./file_base_area.js').getFileAreaByTag;
+const getDescFromFileName				= require('./file_base_area.js').getDescFromFileName;
+const ansiGoto							= require('./ansi_term.js').goto;
+const moveFileWithCollisionHandling		= require('./file_util.js').moveFileWithCollisionHandling;
+const pathWithTerminatingSeparator		= require('./file_util.js').pathWithTerminatingSeparator;
+const Log								= require('./logger.js').log;
+const Errors							= require('./enig_error.js').Errors;
+const FileEntry							= require('./file_entry.js');
+const isAnsi							= require('./string_util.js').isAnsi;
 
 //	deps
 const async								= require('async');

core/user_list.js

@@ -1,10 +1,10 @@
 /* jslint node: true */
 'use strict';
 
-const MenuModule		= require('../../core/menu_module.js').MenuModule;
-const User				= require('../../core/user.js');
-const ViewController	= require('../../core/view_controller.js').ViewController;
-const stringFormat		= require('../../core/string_format.js');
+const MenuModule		= require('./menu_module.js').MenuModule;
+const User				= require('./user.js');
+const ViewController	= require('./view_controller.js').ViewController;
+const stringFormat		= require('./string_format.js');
 
 const moment			= require('moment');
 const async				= require('async');

core/whos_online.js

@@ -2,10 +2,10 @@
 'use strict';
 
 //	ENiGMA½
-const MenuModule			= require('../../core/menu_module.js').MenuModule;
-const ViewController		= require('../../core/view_controller.js').ViewController;
-const getActiveNodeList		= require('../../core/client_connections.js').getActiveNodeList;
-const stringFormat			= require('../../core/string_format.js');
+const MenuModule			= require('./menu_module.js').MenuModule;
+const ViewController		= require('./view_controller.js').ViewController;
+const getActiveNodeList		= require('./client_connections.js').getActiveNodeList;
+const stringFormat			= require('./string_format.js');
 
 //	deps
 const async					= require('async');