package-ify classes for modular design; fixes javadoc