[HB] More de-C++'ization
drwxr-xr-x - src