Cleanup top-level dir #69