Giant commit to move stuff into main/java