Updated file hierarchy, edited namespaces