partial refactoring of header files only
refactored 'sending code' (only header)
Refactored all header files ('quick draft mode')