Updating file structure, templates and README files