diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.js b/accounts/doctype/purchase_invoice/purchase_invoice.js
index c6f9e97b51b..8d37b77c76e 100644
--- a/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -17,8 +17,8 @@
 cur_frm.cscript.tname = "Purchase Invoice Item";
 cur_frm.cscript.fname = "entries";
 cur_frm.cscript.other_fname = "purchase_tax_details";
-wn.require('erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js');
-wn.require('erpnext/buying/doctype/purchase_common/purchase_common.js');
+wn.require('app/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js');
+wn.require('app/buying/doctype/purchase_common/purchase_common.js');
 
 // On Load
 // --------
diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js
index 9e0a4ebf397..091c652e4af 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/accounts/doctype/sales_invoice/sales_invoice.js
@@ -22,10 +22,10 @@ cur_frm.cscript.sales_team_fname = "sales_team";
 // print heading
 cur_frm.pformat.print_heading = 'Invoice';
 
-wn.require('erpnext/selling/doctype/sales_common/sales_common.js');
-wn.require('erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js');
-wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
-wn.require('erpnext/setup/doctype/notification_control/notification_control.js');
+wn.require('app/selling/doctype/sales_common/sales_common.js');
+wn.require('app/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js');
+wn.require('app/utilities/doctype/sms_control/sms_control.js');
+wn.require('app/setup/doctype/notification_control/notification_control.js');
 
 // On Load
 // -------
diff --git a/buying/doctype/purchase_order/purchase_order.js b/buying/doctype/purchase_order/purchase_order.js
index 4e8c2c0384a..0eb830bcde7 100644
--- a/buying/doctype/purchase_order/purchase_order.js
+++ b/buying/doctype/purchase_order/purchase_order.js
@@ -18,10 +18,10 @@ cur_frm.cscript.tname = "Purchase Order Item";
 cur_frm.cscript.fname = "po_details";
 cur_frm.cscript.other_fname = "purchase_tax_details";
 
-wn.require('erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js');
-wn.require('erpnext/buying/doctype/purchase_common/purchase_common.js');
-wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
-wn.require('erpnext/setup/doctype/notification_control/notification_control.js');
+wn.require('app/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js');
+wn.require('app/buying/doctype/purchase_common/purchase_common.js');
+wn.require('app/utilities/doctype/sms_control/sms_control.js');
+wn.require('app/setup/doctype/notification_control/notification_control.js');
 
 cur_frm.cscript.onload = function(doc, cdt, cdn) {
 	// set missing values in parent doc
diff --git a/buying/doctype/purchase_request/purchase_request.js b/buying/doctype/purchase_request/purchase_request.js
index 733da5260ca..52093397c99 100644
--- a/buying/doctype/purchase_request/purchase_request.js
+++ b/buying/doctype/purchase_request/purchase_request.js
@@ -17,8 +17,8 @@
 cur_frm.cscript.tname = "Purchase Request Item";
 cur_frm.cscript.fname = "indent_details";
 
-wn.require('erpnext/buying/doctype/purchase_common/purchase_common.js');
-wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
+wn.require('app/buying/doctype/purchase_common/purchase_common.js');
+wn.require('app/utilities/doctype/sms_control/sms_control.js');
 	
 //========================== On Load =================================================
 cur_frm.cscript.onload = function(doc, cdt, cdn) {
diff --git a/buying/doctype/supplier/supplier.js b/buying/doctype/supplier/supplier.js
index a5b928fe23f..e3f591c7310 100644
--- a/buying/doctype/supplier/supplier.js
+++ b/buying/doctype/supplier/supplier.js
@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-wn.require('erpnext/setup/doctype/contact_control/contact_control.js');
-wn.require('erpnext/support/doctype/communication/communication.js');
+wn.require('app/setup/doctype/contact_control/contact_control.js');
+wn.require('app/support/doctype/communication/communication.js');
 
 cur_frm.cscript.onload = function(doc,dt,dn){
 
diff --git a/buying/doctype/supplier_quotation/supplier_quotation.js b/buying/doctype/supplier_quotation/supplier_quotation.js
index 6135ad4d9fc..faaf296cb5c 100644
--- a/buying/doctype/supplier_quotation/supplier_quotation.js
+++ b/buying/doctype/supplier_quotation/supplier_quotation.js
@@ -20,8 +20,8 @@ cur_frm.cscript.fname = "quotation_items";
 cur_frm.cscript.other_fname = "purchase_tax_details";
 
 // attach required files
-wn.require('erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js');
-wn.require('erpnext/buying/doctype/purchase_common/purchase_common.js');
+wn.require('app/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js');
+wn.require('app/buying/doctype/purchase_common/purchase_common.js');
 
 cur_frm.cscript.onload = function(doc, dt, dn) {
 	// set missing values in parent doc
diff --git a/home/page/desktop/desktop.css b/home/page/desktop/desktop.css
index 59e50eb0a8e..7b8c21ef4ae 100644
--- a/home/page/desktop/desktop.css
+++ b/home/page/desktop/desktop.css
@@ -17,7 +17,7 @@
 .sprite-todo{ background-position: 0 -1290px; width: 40px; height: 34px; } 
 .sprite-website{ background-position: 0 -1374px; width: 40px; height: 40px; } 
 
-.sprite-image { background-image: url("images/sprite-desktop.png"); }
+.sprite-image { background-image: url("app/images/sprite-desktop.png"); }
 
 
 .sprite-account{ margin-top: 8px; margin-left: 12px; } 
diff --git a/hr/doctype/expense_claim/expense_claim.js b/hr/doctype/expense_claim/expense_claim.js
index eabb47647c5..a4d26ea3441 100644
--- a/hr/doctype/expense_claim/expense_claim.js
+++ b/hr/doctype/expense_claim/expense_claim.js
@@ -94,7 +94,7 @@ cur_frm.cscript.sanctioned_amount = function(doc,cdt,cdn){
 	cur_frm.cscript.calculate_total(doc,cdt,cdn);
 }
 
-wn.require('erpnext/setup/doctype/notification_control/notification_control.js');
+wn.require('app/setup/doctype/notification_control/notification_control.js');
 
 cur_frm.cscript.approve = function(doc,cdt,cdn){
 
diff --git a/projects/doctype/project/project.js b/projects/doctype/project/project.js
index eca926190a9..eb3edbdb910 100644
--- a/projects/doctype/project/project.js
+++ b/projects/doctype/project/project.js
@@ -19,7 +19,7 @@
 cur_frm.cscript.refresh = function(doc) {
 	if(!doc.__islocal) {
 		// refresh gantt chart
-		wn.require('erpnext/projects/gantt_task.js');
+		wn.require('app/projects/gantt_task.js');
 		if(!cur_frm.gantt_area)
 			cur_frm.gantt_area = $('<div>')
 				.appendTo(cur_frm.fields_dict.project_tasks.wrapper);
diff --git a/public/build.json b/public/build.json
index d0ad3c6ce76..a4d21242630 100644
--- a/public/build.json
+++ b/public/build.json
@@ -1,20 +1,20 @@
 {
 	"public/css/all-web.css": [
-		"app/erpnext/startup/startup.css",
-		"app/erpnext/website/css/website.css"	
+		"app/startup/startup.css",
+		"app/website/css/website.css"	
 	],
 	"public/css/all-app.css": [
-		"app/erpnext/startup/startup.css"
+		"app/startup/startup.css"
 	],
 	"public/js/all-web.js": [
 		"erpnext/startup/startup.js",
-		"app/public/conf.js"
+		"app/public/js/conf.js"
 	],
 	"public/js/all-app.js": [
-		"app/erpnext/startup/startup.js",
-		"app/erpnext/startup/js/modules.js",
-		"app/erpnext/startup/js/toolbar.js",
-		"app/erpnext/startup/js/feature_setup.js",
-		"app/public/conf.js"
+		"app/startup/startup.js",
+		"app/startup/js/modules.js",
+		"app/startup/js/toolbar.js",
+		"app/startup/js/feature_setup.js",
+		"app/public/js/conf.js"
 	],
 }
\ No newline at end of file
diff --git a/selling/doctype/customer/customer.js b/selling/doctype/customer/customer.js
index 708573d836e..82d001fbdd3 100644
--- a/selling/doctype/customer/customer.js
+++ b/selling/doctype/customer/customer.js
@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-wn.require('erpnext/setup/doctype/contact_control/contact_control.js');
-wn.require('erpnext/support/doctype/communication/communication.js');
+wn.require('app/setup/doctype/contact_control/contact_control.js');
+wn.require('app/support/doctype/communication/communication.js');
 
 /* ********************************* onload ********************************************* */
 
diff --git a/selling/doctype/lead/lead.js b/selling/doctype/lead/lead.js
index 504b0bdc7af..3f45603a64f 100644
--- a/selling/doctype/lead/lead.js
+++ b/selling/doctype/lead/lead.js
@@ -16,8 +16,8 @@
 
 // Module CRM
 
-wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
-wn.require('erpnext/support/doctype/communication/communication.js');
+wn.require('app/utilities/doctype/sms_control/sms_control.js');
+wn.require('app/support/doctype/communication/communication.js');
 
 cur_frm.cscript.onload = function(doc, cdt, cdn) {
 	if(user =='Guest'){
diff --git a/selling/doctype/opportunity/opportunity.js b/selling/doctype/opportunity/opportunity.js
index 52cb5fd7043..45ceda982a6 100644
--- a/selling/doctype/opportunity/opportunity.js
+++ b/selling/doctype/opportunity/opportunity.js
@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
-wn.require('erpnext/support/doctype/communication/communication.js');
+wn.require('app/utilities/doctype/sms_control/sms_control.js');
+wn.require('app/support/doctype/communication/communication.js');
 
 cur_frm.cscript.refresh = function(doc, cdt, cdn){
 	erpnext.hide_naming_series();
diff --git a/selling/doctype/quotation/quotation.js b/selling/doctype/quotation/quotation.js
index 2f97badd00c..cc5bc318adc 100644
--- a/selling/doctype/quotation/quotation.js
+++ b/selling/doctype/quotation/quotation.js
@@ -21,11 +21,11 @@ cur_frm.cscript.other_fname = "other_charges";
 cur_frm.cscript.sales_team_fname = "sales_team";
 
 // =====================================================================================
-wn.require('erpnext/selling/doctype/sales_common/sales_common.js');
-wn.require('erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js');
-wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
-wn.require('erpnext/setup/doctype/notification_control/notification_control.js');
-wn.require('erpnext/support/doctype/communication/communication.js');
+wn.require('app/selling/doctype/sales_common/sales_common.js');
+wn.require('app/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js');
+wn.require('app/utilities/doctype/sms_control/sms_control.js');
+wn.require('app/setup/doctype/notification_control/notification_control.js');
+wn.require('app/support/doctype/communication/communication.js');
 
 // ONLOAD
 // ===================================================================================
diff --git a/selling/doctype/sales_common/sales_common.js b/selling/doctype/sales_common/sales_common.js
index fe5582d613a..9050c2243d5 100644
--- a/selling/doctype/sales_common/sales_common.js
+++ b/selling/doctype/sales_common/sales_common.js
@@ -18,7 +18,7 @@
 // ------
 // cur_frm.cscript.tname - Details table name
 // cur_frm.cscript.fname - Details fieldname
-// cur_frm.cscript.other_fname - wn.require('erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js'); fieldname
+// cur_frm.cscript.other_fname - wn.require('app/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js'); fieldname
 // cur_frm.cscript.sales_team_fname - Sales Team fieldname
 
 // ============== Load Default Taxes ===================
diff --git a/selling/doctype/sales_order/sales_order.js b/selling/doctype/sales_order/sales_order.js
index f4089be20f6..634301e51ba 100644
--- a/selling/doctype/sales_order/sales_order.js
+++ b/selling/doctype/sales_order/sales_order.js
@@ -22,10 +22,10 @@ cur_frm.cscript.other_fname = "other_charges";
 cur_frm.cscript.sales_team_fname = "sales_team";
 
 
-wn.require('erpnext/selling/doctype/sales_common/sales_common.js');
-wn.require('erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js');
-wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
-wn.require('erpnext/setup/doctype/notification_control/notification_control.js');
+wn.require('app/selling/doctype/sales_common/sales_common.js');
+wn.require('app/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js');
+wn.require('app/utilities/doctype/sms_control/sms_control.js');
+wn.require('app/setup/doctype/notification_control/notification_control.js');
 
 
 // ONLOAD
diff --git a/setup/doctype/sales_partner/sales_partner.js b/setup/doctype/sales_partner/sales_partner.js
index 4f2aba2a193..caf16dca10f 100644
--- a/setup/doctype/sales_partner/sales_partner.js
+++ b/setup/doctype/sales_partner/sales_partner.js
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-wn.require('erpnext/setup/doctype/contact_control/contact_control.js');
+wn.require('app/setup/doctype/contact_control/contact_control.js');
 
 cur_frm.cscript.onload = function(doc,dt,dn){
 	// history doctypes and scripts
diff --git a/stock/doctype/delivery_note/delivery_note.js b/stock/doctype/delivery_note/delivery_note.js
index 5242f24fa62..03743e2ffe4 100644
--- a/stock/doctype/delivery_note/delivery_note.js
+++ b/stock/doctype/delivery_note/delivery_note.js
@@ -20,10 +20,10 @@ cur_frm.cscript.fname = "delivery_note_details";
 cur_frm.cscript.other_fname = "other_charges";
 cur_frm.cscript.sales_team_fname = "sales_team";
 
-wn.require('erpnext/selling/doctype/sales_common/sales_common.js');
-wn.require('erpnext/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js');
-wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
-wn.require('erpnext/setup/doctype/notification_control/notification_control.js');
+wn.require('app/selling/doctype/sales_common/sales_common.js');
+wn.require('app/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js');
+wn.require('app/utilities/doctype/sms_control/sms_control.js');
+wn.require('app/setup/doctype/notification_control/notification_control.js');
 
 // ONLOAD
 // ================================================================================================
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.js b/stock/doctype/purchase_receipt/purchase_receipt.js
index eb048ea2082..9cb13f4a740 100644
--- a/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -18,10 +18,10 @@ cur_frm.cscript.tname = "Purchase Receipt Item";
 cur_frm.cscript.fname = "purchase_receipt_details";
 cur_frm.cscript.other_fname = "purchase_tax_details";
 
-wn.require('erpnext/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js');
-wn.require('erpnext/buying/doctype/purchase_common/purchase_common.js');
-wn.require('erpnext/utilities/doctype/sms_control/sms_control.js');
-wn.require('erpnext/setup/doctype/notification_control/notification_control.js');
+wn.require('app/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js');
+wn.require('app/buying/doctype/purchase_common/purchase_common.js');
+wn.require('app/utilities/doctype/sms_control/sms_control.js');
+wn.require('app/setup/doctype/notification_control/notification_control.js');
 
 //========================== On Load ================================================================
 cur_frm.cscript.onload = function(doc, cdt, cdn) {
diff --git a/utilities/page/question_view/question_view.js b/utilities/page/question_view/question_view.js
index b646cf628d8..43710828d98 100644
--- a/utilities/page/question_view/question_view.js
+++ b/utilities/page/question_view/question_view.js
@@ -186,4 +186,4 @@ KBAnswer = function(body, data, ans_list) {
 }
 
 
-wn.require('erpnext/utilities/page/kb_common/kb_common.js');
+wn.require('app/utilities/page/kb_common/kb_common.js');