Complete the refactoring of the package to split it into more manageable and logical file structures and classes.

This will also include improving the conventions used and also the ability for new contributors to understand where to work in things.