Merge "change order in class for java convention"