diff --git a/license/COPYING b/COPYING
similarity index 100%
rename from license/COPYING
rename to COPYING
diff --git a/Gruntfile.js b/Gruntfile.js
index 6fbed051c..806b3fcc6 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -26,7 +26,7 @@ module.exports = function(grunt) {
 			targetcssdist: {
 				options: {
 					srcPrefix: 'css',
-					destPrefix: 'dist'
+					destPrefix: 'public/dist'
 				},
 				files: {
 					'login.css': 'login.css',
@@ -75,7 +75,7 @@ module.exports = function(grunt) {
 					srcPrefix: './'
 				},
 				files: {
-					'license': 'public/license/COPYING'
+					'public/license': 'COPYING'
 				}
 			},
 		},
@@ -231,7 +231,7 @@ module.exports = function(grunt) {
 					noGood: true
 				},
 				log: {
-					outFile: 'license/.licenses',
+					outFile: 'public/license/.licenses',
 					nonBower: true,
 					noLicense: true,
 					allGood: true,
diff --git a/database/database.sql b/database/database.sql
index 484e7815a..6613703d3 100644
--- a/database/database.sql
+++ b/database/database.sql
@@ -79,7 +79,9 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
 ('smtp_timeout', '5'),
 ('smtp_crypto', 'ssl'),
 ('receipt_template', 'receipt_default'),
-('theme', 'flatly');
+('theme', 'flatly'),
+('language', 'english'),
+('language_code', 'en');
 
 
 -- --------------------------------------------------------
diff --git a/database/migrate_phppos_dist.sql b/database/migrate_phppos_dist.sql
index ad00c08b7..5cedeeb41 100644
--- a/database/migrate_phppos_dist.sql
+++ b/database/migrate_phppos_dist.sql
@@ -79,7 +79,9 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
 ('smtp_timeout', '5'),
 ('smtp_crypto', 'ssl'),
 ('receipt_template', 'receipt_default'),
-('theme', 'flatly');
+('theme', 'flatly'),
+('language', 'english'),
+('language_code', 'en');
 
 
 -- --------------------------------------------------------
diff --git a/license/.licenses b/license/.licenses
deleted file mode 100644
index 93408aff6..000000000
--- a/license/.licenses
+++ /dev/null
@@ -1,27 +0,0 @@
-=== [ ALL GOOD ] ===
-bootstrap > MIT
-bootstrap-select > MIT
-bootstrap-table > MIT
-bootswatch > MIT
-file-saver.js > LICENSE.md
-jquery > MIT
-jquery-validate > MIT
-js-cookie > MIT
-jspdf > MIT
-jspdf-autotable > MIT
-remarkable-bootstrap-notify > MIT
-tableExport.jquery.plugin > MIT
-
-=== [ NO LICENSE ] ===
-bootstrap-daterangepicker
-bootstrap3-dialog
-chartist
-chartist-plugin-axistitle
-chartist-plugin-pointlabels
-chartist-plugin-tooltip
-html2canvas
-jasny-bootstrap
-jquery-form
-jquery-ui
-moment
-smalot-bootstrap-datetimepicker
\ No newline at end of file
diff --git a/public/images/checkbox_arrow.gif b/public/images/checkbox_arrow.gif
deleted file mode 100644
index 5a9ff8314..000000000
Binary files a/public/images/checkbox_arrow.gif and /dev/null differ
diff --git a/public/images/tables/asc.gif b/public/images/tables/asc.gif
deleted file mode 100644
index 74157867f..000000000
Binary files a/public/images/tables/asc.gif and /dev/null differ
diff --git a/public/images/tables/bg.gif b/public/images/tables/bg.gif
deleted file mode 100644
index fac668fcf..000000000
Binary files a/public/images/tables/bg.gif and /dev/null differ
diff --git a/public/images/tables/desc.gif b/public/images/tables/desc.gif
deleted file mode 100644
index 3b30b3c58..000000000
Binary files a/public/images/tables/desc.gif and /dev/null differ
diff --git a/license/gatracking.license b/public/license/gatracking.license
similarity index 100%
rename from license/gatracking.license
rename to public/license/gatracking.license
diff --git a/license/gatracking.version b/public/license/gatracking.version
similarity index 100%
rename from license/gatracking.version
rename to public/license/gatracking.version