More refactoring and beginnings of a Wishbone interconnect