Initial commit of new server structure