re-structure rake tasks