Utilities rename, buttons addition
Reorganization of a structure, small changes in files