Reorganizing all project files, exercise 1.4 and 1.5 still works at this stage. Will start refactoring now