Classes moved into new submodule; sync