Restructuring with latest gcmServer updates