Refactoring: Move around some packages and classes to normalize the code.