renamed java packages using prof's conventions