I was thinking about it as well. So you reckon the interface, states and maybe the context into a subpackage? On the other hand, the current package is not yet overcrowed either.