Restructed namespace
Merged with latest commit