Merge pull request #305 from genu/development

Development
Merge pull request #306 from genu/development

Reorganize JS files