Moved Everything Into a Template Folder
Merge branch 'subdirectories'