fixed layout, so no more portage errors, and removed some older elastic search