MRQL-32: Refactoring directory structure for Eclipse
MRQL-33: Fix various bugs in iteration queries