refactored a lot, added elasticsearch, fixed docker images