Encapsulate some classes in distribution package