- reorangizing code and packages