Fixed require.js def problem
Rejiggled project structure