diff --git a/erpnext/accounts/doctype/sales_invoice/templates/pages/invoice.html b/erpnext/accounts/doctype/sales_invoice/templates/pages/invoice.html
index db6e009f891..44c53308493 100644
--- a/erpnext/accounts/doctype/sales_invoice/templates/pages/invoice.html
+++ b/erpnext/accounts/doctype/sales_invoice/templates/pages/invoice.html
@@ -1,4 +1,4 @@
-{% extends "app/portal/templates/sale.html" %}
+{% extends "portal/templates/sale.html" %}
 
 {% block status -%}
 	{% if doc.status %}{{ doc.status }}{% endif %}
diff --git a/erpnext/accounts/doctype/sales_invoice/templates/pages/invoices.html b/erpnext/accounts/doctype/sales_invoice/templates/pages/invoices.html
index f108683cb93..f8ca76980fd 100644
--- a/erpnext/accounts/doctype/sales_invoice/templates/pages/invoices.html
+++ b/erpnext/accounts/doctype/sales_invoice/templates/pages/invoices.html
@@ -1 +1 @@
-{% extends "app/portal/templates/sales_transactions.html" %}
\ No newline at end of file
+{% extends "portal/templates/sales_transactions.html" %}
\ No newline at end of file
diff --git a/erpnext/portal/templates/base.html b/erpnext/portal/templates/base.html
index bc6fb9755c6..3eb7adca8e0 100644
--- a/erpnext/portal/templates/base.html
+++ b/erpnext/portal/templates/base.html
@@ -1,3 +1,3 @@
-{% extends "lib/website/templates/base.html" %}
+{% extends "website/templates/base.html" %}
 
-{% block footer %}{% include "app/portal/templates/includes/footer.html" %}{% endblock %}
\ No newline at end of file
+{% block footer %}{% include "portal/templates/includes/footer.html" %}{% endblock %}
\ No newline at end of file
diff --git a/erpnext/portal/templates/includes/footer.html b/erpnext/portal/templates/includes/footer.html
index cd75fd16f63..9912c9cf0a0 100644
--- a/erpnext/portal/templates/includes/footer.html
+++ b/erpnext/portal/templates/includes/footer.html
@@ -1,4 +1,4 @@
-{% extends "lib/website/templates/includes/footer.html" %}
+{% extends "website/templates/includes/footer.html" %}
 
 {% block powered %}<a href="http://erpnext.org" style="color: #aaa;">ERPNext Powered</a>{% endblock %}
 
diff --git a/erpnext/portal/templates/pages/cart.html b/erpnext/portal/templates/pages/cart.html
index 1abe46787c4..db812299f3f 100644
--- a/erpnext/portal/templates/pages/cart.html
+++ b/erpnext/portal/templates/pages/cart.html
@@ -1,7 +1,7 @@
 {% extends base_template %}
 
 {% block javascript %}
-<script>{% include "app/portal/templates/includes/cart.js" %}</script>
+<script>{% include "portal/templates/includes/cart.js" %}</script>
 {% endblock %}
 
 {% set title="Shopping Cart" %}
diff --git a/erpnext/portal/templates/sales_transactions.html b/erpnext/portal/templates/sales_transactions.html
index f4fd5d18cc0..632793c85a1 100644
--- a/erpnext/portal/templates/sales_transactions.html
+++ b/erpnext/portal/templates/sales_transactions.html
@@ -1,4 +1,4 @@
-{% extends "app/portal/templates/includes/transactions.html" %}
+{% extends "portal/templates/includes/transactions.html" %}
 
 {% block javascript -%}
 <script>
diff --git a/erpnext/selling/doctype/sales_order/templates/pages/order.html b/erpnext/selling/doctype/sales_order/templates/pages/order.html
index db6e009f891..44c53308493 100644
--- a/erpnext/selling/doctype/sales_order/templates/pages/order.html
+++ b/erpnext/selling/doctype/sales_order/templates/pages/order.html
@@ -1,4 +1,4 @@
-{% extends "app/portal/templates/sale.html" %}
+{% extends "portal/templates/sale.html" %}
 
 {% block status -%}
 	{% if doc.status %}{{ doc.status }}{% endif %}
diff --git a/erpnext/selling/doctype/sales_order/templates/pages/orders.html b/erpnext/selling/doctype/sales_order/templates/pages/orders.html
index f108683cb93..f8ca76980fd 100644
--- a/erpnext/selling/doctype/sales_order/templates/pages/orders.html
+++ b/erpnext/selling/doctype/sales_order/templates/pages/orders.html
@@ -1 +1 @@
-{% extends "app/portal/templates/sales_transactions.html" %}
\ No newline at end of file
+{% extends "portal/templates/sales_transactions.html" %}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/item_group/templates/generators/item_group.html b/erpnext/setup/doctype/item_group/templates/generators/item_group.html
index e80d0a22ad1..f021916eb4b 100644
--- a/erpnext/setup/doctype/item_group/templates/generators/item_group.html
+++ b/erpnext/setup/doctype/item_group/templates/generators/item_group.html
@@ -1,11 +1,11 @@
 {% extends base_template %}
 
 {% block content %}
-{% include 'app/stock/doctype/item/templates/includes/product_search_box.html' %}
-{% include 'app/stock/doctype/item/templates/includes/product_breadcrumbs.html' %}
+{% include 'stock/doctype/item/templates/includes/product_search_box.html' %}
+{% include 'stock/doctype/item/templates/includes/product_breadcrumbs.html' %}
 <div class="container content">
 	{% if slideshow %}<!-- slideshow -->
-	{% include "lib/website/doctype/website_slideshow/templates/includes/slideshow.html" %}
+	{% include "website/doctype/website_slideshow/templates/includes/slideshow.html" %}
 	{% endif %}
 	{% if description %}<!-- description -->
 	<div itemprop="description">{{ description or ""}}</div>
@@ -42,7 +42,7 @@
 $(function() {
 	if(window.logged_in && getCookie("system_user")==="yes") {
 		wn.has_permission("Item Group", "{{ name }}", "write", function(r) {
-			wn.require("lib/js/wn/website/editable.js");
+			wn.require("js/wn/website/editable.js");
 			wn.make_editable($('[itemprop="description"]'), "Item Group", "{{ name }}", "description");
 		});
 	}
diff --git a/erpnext/startup/event_handlers.py b/erpnext/startup/event_handlers.py
index f0323ea36a7..b59dee57126 100644
--- a/erpnext/startup/event_handlers.py
+++ b/erpnext/startup/event_handlers.py
@@ -64,10 +64,6 @@ def check_if_expired():
 	webnotes.response['message'] = 'Account Expired'
 	raise webnotes.AuthenticationError
 
-def on_build():
-	from home.page.latest_updates import latest_updates
-	latest_updates.make()
-
 def comment_added(doc):
 	"""add comment to feed"""
 	home.make_feed('Comment', doc.comment_doctype, doc.comment_docname, doc.comment_by,
diff --git a/erpnext/stock/doctype/delivery_note/templates/pages/shipment.html b/erpnext/stock/doctype/delivery_note/templates/pages/shipment.html
index 376e5df7c29..fafa03bd5ec 100644
--- a/erpnext/stock/doctype/delivery_note/templates/pages/shipment.html
+++ b/erpnext/stock/doctype/delivery_note/templates/pages/shipment.html
@@ -1 +1 @@
-{% extends "app/portal/templates/sale.html" %}
\ No newline at end of file
+{% extends "portal/templates/sale.html" %}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_note/templates/pages/shipments.html b/erpnext/stock/doctype/delivery_note/templates/pages/shipments.html
index f108683cb93..f8ca76980fd 100644
--- a/erpnext/stock/doctype/delivery_note/templates/pages/shipments.html
+++ b/erpnext/stock/doctype/delivery_note/templates/pages/shipments.html
@@ -1 +1 @@
-{% extends "app/portal/templates/sales_transactions.html" %}
\ No newline at end of file
+{% extends "portal/templates/sales_transactions.html" %}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item/templates/generators/item.html b/erpnext/stock/doctype/item/templates/generators/item.html
index 545693d0c77..141982bbba4 100644
--- a/erpnext/stock/doctype/item/templates/generators/item.html
+++ b/erpnext/stock/doctype/item/templates/generators/item.html
@@ -2,12 +2,12 @@
 
 {% block javascript %}
 <script>
-	{% include "app/stock/doctype/item/templates/includes/product_page.js" %}
+	{% include "stock/doctype/item/templates/includes/product_page.js" %}
 	
 	$(function() {
 		if(window.logged_in && getCookie("system_user")==="yes") {
 			wn.has_permission("Item", "{{ name }}", "write", function(r) {
-				wn.require("lib/js/wn/website/editable.js");
+				wn.require("js/wn/website/editable.js");
 				wn.make_editable($('[itemprop="description"]'), "Item", "{{ name }}", "web_long_description");
 			});
 		}
@@ -17,25 +17,25 @@
 
 {% block css %}
 <style>
-	{% include "app/stock/doctype/item/templates/includes/product_page.css" %}
+	{% include "stock/doctype/item/templates/includes/product_page.css" %}
 </style>
 {% endblock %}
 
 {% block content %}
-	{% include 'app/stock/doctype/item/templates/includes/product_search_box.html' %}
-	{% include 'app/stock/doctype/item/templates/includes/product_breadcrumbs.html' %}
+	{% include 'stock/doctype/item/templates/includes/product_search_box.html' %}
+	{% include 'stock/doctype/item/templates/includes/product_breadcrumbs.html' %}
 	<div class="container content product-page-content" itemscope itemtype="http://schema.org/Product">
 		<div class="row">
 			<div class="col-md-6">
 				{% if slideshow %}
-					{% include "lib/website/doctype/website_slideshow/templates/includes/slideshow.html" %}
+					{% include "website/doctype/website_slideshow/templates/includes/slideshow.html" %}
 				{% else %}
 					{% if website_image %}
 					<image itemprop="image" class="item-main-image"
 						src="{{ website_image }}" />
 					{% else %}
 					<div class="img-area">
-		{% include 'app/stock/doctype/item/templates/includes/product_missing_image.html' %}
+		{% include 'stock/doctype/item/templates/includes/product_missing_image.html' %}
 					</div>
 					{% endif %}
 				{% endif %}
diff --git a/erpnext/stock/doctype/item/templates/includes/product_in_grid.html b/erpnext/stock/doctype/item/templates/includes/product_in_grid.html
index 4271aaabb29..d99ad002945 100644
--- a/erpnext/stock/doctype/item/templates/includes/product_in_grid.html
+++ b/erpnext/stock/doctype/item/templates/includes/product_in_grid.html
@@ -4,7 +4,7 @@
 		{%- if website_image -%}
 		<img class="product-image" style="width: 80%; margin: auto;" src="{{ website_image }}">
 		{%- else -%}
-		{% include 'app/stock/doctype/item/templates/includes/product_missing_image.html' %}
+		{% include 'stock/doctype/item/templates/includes/product_missing_image.html' %}
 		{%- endif -%}
 		</a>
 	</div>
diff --git a/erpnext/stock/doctype/item/templates/includes/product_in_list.html b/erpnext/stock/doctype/item/templates/includes/product_in_list.html
index c501283b89c..f895ab68102 100644
--- a/erpnext/stock/doctype/item/templates/includes/product_in_list.html
+++ b/erpnext/stock/doctype/item/templates/includes/product_in_list.html
@@ -5,7 +5,7 @@
 		{%- if website_image -%}
 		<img class="product-image" style="width: 80%; margin: auto;" src="{{ website_image }}">
 		{%- else -%}
-		{% include 'app/website/templates/html/product_missing_image.html' %}
+		{% include 'website/templates/html/product_missing_image.html' %}
 		{%- endif -%}
 		</a>
 	</div>
diff --git a/erpnext/stock/doctype/item/templates/pages/product_search.html b/erpnext/stock/doctype/item/templates/pages/product_search.html
index 132e3b1e022..02c161cd90e 100644
--- a/erpnext/stock/doctype/item/templates/pages/product_search.html
+++ b/erpnext/stock/doctype/item/templates/pages/product_search.html
@@ -3,7 +3,7 @@
 {% set title="Product Search" %}
 
 {% block javascript %}
-<script>{% include "app/stock/doctype/item/templates/includes/product_list.js" %}</script>
+<script>{% include "stock/doctype/item/templates/includes/product_list.js" %}</script>
 {% endblock %}
 
 {% block content %}
@@ -17,7 +17,7 @@ $(document).ready(function() {
 });
 </script>
 
-{% include "app/stock/doctype/item/templates/includes/product_search_box.html" %}
+{% include "stock/doctype/item/templates/includes/product_search_box.html" %}
 <div class="container content">
 	<h3 class="search-results">Search Results</h3>
 	<div id="search-list" class="row">
diff --git a/erpnext/support/doctype/support_ticket/templates/pages/tickets.html b/erpnext/support/doctype/support_ticket/templates/pages/tickets.html
index d99e6145d97..549c227981b 100644
--- a/erpnext/support/doctype/support_ticket/templates/pages/tickets.html
+++ b/erpnext/support/doctype/support_ticket/templates/pages/tickets.html
@@ -1,4 +1,4 @@
-{% extends "app/portal/templates/includes/transactions.html" %}
+{% extends "portal/templates/includes/transactions.html" %}
 
 {% block javascript -%}
 {{ super() }}
diff --git a/erpnext/translations/languages.json b/erpnext/translations/languages.json
deleted file mode 100644
index 9bffb5c9ffd..00000000000
--- a/erpnext/translations/languages.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"中国（简体）": "zh-cn",
-	"中國（繁體）": "zh-tw",
-	"deutsch": "de",
-	"ελληνικά": "el",
-	"english": "en",
-	"español": "es",
-	"français": "fr",
-	"हिंदी": "hi",
-	"hrvatski": "hr",
-	"italiano": "it",
-	"nederlands": "nl",
-	"português brasileiro": "pt-BR",
-	"português": "pt",
-	"српски":"sr",
-	"தமிழ்": "ta",
-	"ไทย": "th",
-	"العربية":"ar"
-}
\ No newline at end of file