refactor ModuleNames, TreeFiltering v0