restructure using requirejs
Merge branch 'dev'