reorg to Club/Game layout from Jack, JS still needs to be split up