restructured server, navi nearly complete