reworking

global namespace, removing source file includes from header files,
cleaning