Moving peer related code to the proper place