Moved Slave and Master APIs into their own modules