Reorganise directories, remove requirejs, include node_modules