moved simple and cluster implementations in distinct packages