Split pub/sub stuff into files