Move js files to sane positions
Merge branch 'feature/ui'