Change namespace and add SimpleOrderedValidatingMap

Some methods got juggled around due using automatic formatting; shouldn't
happen again.