chnage file structure for autoloader