Refactoring, namespaces, aligned with file system