moved more things around
more signalr cleanup.