Server is wholly contained in /server now