- Initial reorganization to use namespace packages