Making server modular