Folder structure change and template system started - v0.2