added namespace
renamed the main header file
Merge branch 'refactoring' into space-deminer