Did some refactoring, moved using inside namespaces