reorg + exercises 2