Reorganize imports.
Removed old lucene code to get rid of the dependency.
Ok, we need lucene-core, but that's it.