Refactor targets to be a bit more usable. Adapt README accordingly