move Classes to submodule