Move packages.
Enforce Java 7.
Implement base classes for query API.