Project restructure and introduction of templates corresponds with part 2