Re-org + CLI (WIP)