Created Factories and introduced namespaces.