Code reorg
Can almost run a test again :)
Can almost run a test again :)
Can almost run a test again :)