lazyloader fixes, files renamed to fix MVC bundling