Moved some classes, created Iconnectable interfaces