More requirejs friendly lazy loading.
Made paths more consistent between client and server.