renaming: ordered classes to new packages, increasing comprehensibility