Rebuild

Initial rebuild integration. Basic server setup.