Consolidate file hierarchy
Simplify globbing code