update server files -- make them more modular