Refactor the mod namespace