refactor reorganize requirejs stuff