Update folders, add format, consolidate special cases & conventions, add qualifiers