reorg + cuba + readme