Move code/test to test, first pass directory reorg