Refactored js structure
Merge branch 'release/2.0.4'
Merge tag '2.0.4' into develop

2.0.4