reorg there too
fix this to not take an eternity
test reorganization
better name for this file