relay: move classes as appropriate and begin addiing in socket layers