Break code into more packages to preserve encapsulation.