Add convenience.
Restructure.