Moving things around in preparation for setting up client app and sockets