move model classes into their own package
add further TODOs to package-infos and tests for future work