Modularizing into packages