Moved Expectant maps to their own package