TODO refactor note added
Renaming and reformatting of jinja2 templates
Removed erroneously added DB definition file