Enhancement: Project restructure and introduction of templates