restructure header files references
rename kludgeString member function to more suitable kludgeMask