Tidying project into more of a template