Replaced the string->Mask map with individual consts; reorganized for a Format dir.