Refactor start
Finished refactoring of MasterSlave and Connectors