Remove ceremonial layers of indirection; revise directories; update test cases