[Pong] Restructure