simplify the hierarchy
improve docs
0.4.19