Start of requirejs refactor