Changed Template System Folder Structure