Refactored the datamodel package. TU
Not sure why this branch exists or why I'm merging it, but ok. TU.

Merge branch 'master' of https://github.com/tedunderwood/GenreProject