Removed the templates and changed folder structure