Refactoring: Sorted table data classes in sub packages