Cleanup, moved rake tasks to the right location.