Changed the organiztion of the templates directory