Attempt to fix build issue.
Tidy things up and begin slicing things up a bit.