Reorganize use cases