Reorganized templates and added notes addign template