packages renamed and client rest builder added