Structure

Some major changes to the file structure of the project, also made a bunch of changes to some models.