refactor testing round one complete
removed old server files