Separate connector-top thing out
Refactoring things a good bit

Extracting bits of code into sensible files