refactoring
unnesesary database package was removed
refactoring + elasticsearchindexing