Refactor, moving all classes to their final place.