roadblock
Cleanup, reorganize classes semantically