diff --git a/hooks/before_prepare/02_jshint.js b/hooks/before_prepare/02_jshint.js
index 7e94c58e20aef627477dad01bb8f2554757cbc35..9316017ff8543c474c83092c435c2910564ada64 100755
--- a/hooks/before_prepare/02_jshint.js
+++ b/hooks/before_prepare/02_jshint.js
@@ -8,11 +8,11 @@ var async = require('async');
 var foldersToProcess = [
     'js',
     'js/controllers',
-    'js/entity',
+    'js/entities',
     'js/services',
     'plugins/es/js',
     'plugins/es/js/controllers',
-    'plugins/es/js/entity',
+    //'plugins/es/js/entities',
     'plugins/es/js/services'
 ];
 
diff --git a/www/index.html b/www/index.html
index ca6bef467cb3fe340673e1a9f4758aed4926637f..35449eb44eed951395d15b652185c6377cd799eb 100644
--- a/www/index.html
+++ b/www/index.html
@@ -65,7 +65,7 @@
       <script src="dist/dist_js/app/services.js"></script>
 
       <!-- entities -->
-      <script src="dist/dist_js/app/entity/peer.js"></script>
+      <script src="dist/dist_js/app/entities/peer.js"></script>
 
       <!-- controllers -->
       <script src="dist/dist_js/app/controllers/app-controllers.js"></script>
diff --git a/www/js/entity/peer.js b/www/js/entities/peer.js
similarity index 100%
rename from www/js/entity/peer.js
rename to www/js/entities/peer.js