deleting dead code
new code splitting
new reorg