Namespaces and filenames updated to new version (3.0.0)