Adding new modularized server
Actually adding the new modularized server
adding directory
Merge branch 'master' into dev