Finished working on structure and refactoring.
Work will now start on issue #5