Move code/test to test
Change paths from code/test to test
Change require path from ../.. to ..
Merge branch 'dir_reorg'