Whole Refactoring on packages just to tidy things up a bit