reorganization

possibly broken