Massive file reorg.
Slight change to chatshell for future