Be consistent about import ordering, we're going to do some heavy automatic refactoring and I don't want to deal with inconsistencies
WIP on google Optional -> java Optional