move package and almost complete the client