reorg, v0.001005
Cleanups