Added errorprone and changed directory layout