Improving organization of templates in select template module
Autocommit Fri Nov 21 15:43:11 EST 2014