Client/Server/Model are now all subclasses of Module
manual merge