Moved classes into apppropriate packages.