refactoring folder structure, adding r.js