Added require.js + restructure