Moved utility classes between packages
Added unit test for class model serialization