Namespace, filename cleanup

Cleaned up namespaces and filenames bit.