[TASK] Namespacify where not already done
Merge pull request #33 from coding46/RefactoringFor6.2

[TASK] Namespacify where not already done