first attempt to make m2server into a module
merged