Refactored "namespace" library