Reorganise internal components

[lcobucci]

This clarifies abstractions and responsibilities, unifying logic, and being more explicit about types.