slight file reorganization