Architecture changes for Mink 2.0 release

Architecture changes, discussed in #415