moving modules
fixing loading blocking issue
Merge branch 'master' into gh-pages