Moved some stuff to requirejs