Lot of restructuring, fixing a lot of checkstyle warnings, improved layout api a lot, caesar nearly finished migrating