reorg things a bit, more or less working. add folder with test data