Some re-organization of classes