Refactored and cleaned up "namespace" library and specs