cleanup
added modular templates for testing purposes