Reorg files
Bump version