Rakefile cleanup

General cleanup & reorganization of rakefile.