Rebase to RequireJS