MRQL-32: Refactoring directory structure for Eclipse