walkdir more restructure