removed alias file
reorder aliases
reorganized config, added HEADERS for grouping