Changed folder structure to accomodate Require.JS