Refactoring: Moved and renamed some classes and methods.