re-org + week 3 files