Move class out of modules.