Change to support any top level dir name