Moved templates that are used by layers into their own directory, cleaned up comments, used template_render instead of stripping the templates everywhere