changing the server structure to remove a bug (in progress)