Refactoring: moved classes around.