update server directory structure -- a more modular approach