Moved classes into sub-namespace