changed header file names
moved position in source tree
removed redundant prefix: 'main'