deleted
Moved tempates into respective folders
Refactored