rearrange some java files