moved some packages, restructured request processing in server