Re-Organized Templates