Add directory defs for standard
Standardize filenames