Moved classes into separate packages.