Move classes to submodule