Moving oldserver into server so there is no need for a package.