renamed some packages added more server stuff