Working on organizing server code