New Folder Structure
Better Pattern
New Template Strategy