Added NestedMapping, NestedQuery, NestedFilter.
Some cleaning up.