Made various changes to the structure of the project because as it is
the saving of information to disk doesn't work