#1028 - Organization of Files Categories and Subcategories | Core | CASE-EJIP
#1028 - finalize and minor bug fix
#1028 merge and fix conflicts