changed packaging for the Server