Reorganize packages, use prod api end point