JS structure and naming changes. Do not panic, all will work as usual. First refactoring stage
Merge branch 'feature/js-refactoring' into develop