Made the client into an own package