~ Adjusted namespaces. Removed unused references