Added more classes and refactored package levels