Move files to correct structure