Repackaged all classes in a useful hierachy.