Streamlining package structure in querqy-lucene