Re-arranged the folder structure in preparation for require.js