cleanup: move data classes to new packages