Tidied things up

Just took what you'd done and made it into packages.
Mainly to understand how you'd modelled it so far.
HOPE YOU LIKE IT