blah
new structure
reorg + exercises