RF-13480: re-structure java packages, rename classes