Cleaned up structure to get rid of old templates.