Refactoring lucene class

Continouing development of class ; to be tested still