Move files and fix autoloader