Cleanup & reorg
Upgraded to the new API
Version bump