Changed how modules are loaded and accessed