Correctly parses namespaces. Changed directory structure