- Rearranged classes into better to manage packages