Reorganizing more server files