Moved namespace to proper folder
Namespace changes continue