move non-core classes into utility package