Fixed existing modules to comply with autoloading