changed file structure for autoloader