Re-organized tree, fixed tests and annoying dev env.