restructured rake tasks