rework folder structure and templates.