Reorganized some elements to my liking
Compliant to both Common.js and Require.js module