Created Maps subnamespace and moved classes into it.