I have begun to organize some classes into their own packages.