Templates!!
- Moved files to template directories
- Corrected file paths