Bump hex number.
Cleanup: simplify function names and reorg files.
Bump Hex number.