Updates incorporating requirejs, and other structure modifications