Corrected paths and namespaces.