Moved classes to the appropriate module.