more reorg of classes/files