Packaged

Packaged classes up for use with import.