Change java files structure