rename and move into subdir
start tree building, add some more tests