add directory structure helper
update test case