cleanup and move rake tasks into load path