added java and elasticsearch
Reorganized includes and added elasticserch