Model class framework and renaming packages.