Refactored namespace/folder structure.