Added Template Folder & Project layout refactored