Canonical Location for Rake Tasks

Moves tasks into their canonical location.