Updating organization of classes