Added new templates, and refactored the file structure.