reorganize js/css files
Merge remote branch 'origin/master' into dypage