added lombok dep. and lombokified some classes.