RequireJS site optimization & file structure changes.
Merge remote-tracking branch 'origin/master'