Changed folder name to reflect namespaces