Tidy up the angular modules and hook up the socket to a service