Reorganized directories. No namespace changes.