Restructure the Rakefile to be clearer and shorter