Organize the master folder