diff --git a/load/control-frameedit.js b/load/control/frameedit.js
similarity index 100%
rename from load/control-frameedit.js
rename to load/control/frameedit.js
diff --git a/load/control-register.js b/load/control/register.js
similarity index 100%
rename from load/control-register.js
rename to load/control/register.js
diff --git a/load/control-sqrllogin.js b/load/control/sqrllogin.js
similarity index 100%
rename from load/control-sqrllogin.js
rename to load/control/sqrllogin.js
diff --git a/main.js b/main.js
index 16b3eaf..765a496 100644
--- a/main.js
+++ b/main.js
@@ -934,7 +934,7 @@ while (bbs.online) {
 						break;
 					}
 
-					require('ansitex/load/control-frameedit.js','CONTROL_FRAMEEDIT');
+					require('ansitex/load/control/frameedit.js','CONTROL_FRAMEEDIT');
 
 					// If we are editing a specific frame, attempt to load it
 					if (next_page) {
@@ -1237,18 +1237,18 @@ while (bbs.online) {
 							// If this is the register page
 							if (so.page.name === new PageObject(FRAME_REGISTER)) {
 								log(LOG_DEBUG,'Adding REGISTER to control stack');
-								require('ansitex/load/control-'+so.page.key[1]+'.js','CONTROL_REGISTER');
+								require('ansitex/load/control/'+so.page.key[1]+'.js','CONTROL_REGISTER');
 								control.push(eval('new '+so.page.key[1]+'();'));
 
 							} else if (so.page.name === new PageObject(FRAME_SQRL)) {
 								log(LOG_DEBUG,'Adding SQRL to control stack');
-								require('ansitex/load/control-'+so.page.key[1]+'.js','CONTROL_SQRL');
+								require('ansitex/load/control/'+so.page.key[1]+'.js','CONTROL_SQRL');
 								control.push(eval('new '+so.page.key[1]+'();'));
 								inkey_timeout = 1000;
 
 							} else if (so.page.key[1] && (so.page.type === FRAME_TYPE_RESPONSE) && (typeof(so.page.key[1]) !== 'number')) {
 								log(LOG_DEBUG,'Adding METHOD to control stack: '+so.page.key[1]);
-								require('ansitex/load/control-'+so.page.key[1]+'.js','CONTROL_'+so.page.key[1].toUpperCase());
+								require('ansitex/load/control/'+so.page.key[1]+'.js','CONTROL_'+so.page.key[1].toUpperCase());
 								control.push(eval('new '+so.page.key[1]+'();'));
 							}