I tend to think of empty hand fighting as existing as three separate (although connected in some ways) "games". You could also look at them as ranges.
For me these are: stand-up, clinch and ground (or for ranges; long, close and ground).
What are your thoughts regarding these?
-John