diff --git a/docs/upgrades/packages-7.9.9/default_ldap_anonymous_registration_template.wgpkg b/docs/upgrades/packages-7.9.9/default_ldap_anonymous_registration_template.wgpkg
deleted file mode 100644
index fc7d0b604..000000000
Binary files a/docs/upgrades/packages-7.9.9/default_ldap_anonymous_registration_template.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.9/default_webgui_anonymous_registration_template.wgpkg b/docs/upgrades/packages-7.9.9/default_webgui_anonymous_registration_template.wgpkg
deleted file mode 100644
index d398c886e..000000000
Binary files a/docs/upgrades/packages-7.9.9/default_webgui_anonymous_registration_template.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.9/greenportal_calendar_greenportal_calendarmonth.wgpkg b/docs/upgrades/packages-7.9.9/greenportal_calendar_greenportal_calendarmonth.wgpkg
deleted file mode 100644
index 0dfbd5389..000000000
Binary files a/docs/upgrades/packages-7.9.9/greenportal_calendar_greenportal_calendarmonth.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.9/matrix-search-template.wgpkg b/docs/upgrades/packages-7.9.9/matrix-search-template.wgpkg
deleted file mode 100644
index 700317f02..000000000
Binary files a/docs/upgrades/packages-7.9.9/matrix-search-template.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.9/root_import_account_inbox_default-inbox-send-message-template.wgpkg b/docs/upgrades/packages-7.9.9/root_import_account_inbox_default-inbox-send-message-template.wgpkg
deleted file mode 100644
index 07ae61705..000000000
Binary files a/docs/upgrades/packages-7.9.9/root_import_account_inbox_default-inbox-send-message-template.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.9/root_import_calendar-templates_default-calendar-month.wgpkg b/docs/upgrades/packages-7.9.9/root_import_calendar-templates_default-calendar-month.wgpkg
deleted file mode 100644
index 055c94f4b..000000000
Binary files a/docs/upgrades/packages-7.9.9/root_import_calendar-templates_default-calendar-month.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.9/root_import_ems_ems-event-submission-main.wgpkg b/docs/upgrades/packages-7.9.9/root_import_ems_ems-event-submission-main.wgpkg
deleted file mode 100644
index 5cd8cf179..000000000
Binary files a/docs/upgrades/packages-7.9.9/root_import_ems_ems-event-submission-main.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.9/root_import_ems_ems-event-submission-queue.wgpkg b/docs/upgrades/packages-7.9.9/root_import_ems_ems-event-submission-queue.wgpkg
deleted file mode 100644
index d93cc9f27..000000000
Binary files a/docs/upgrades/packages-7.9.9/root_import_ems_ems-event-submission-queue.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.9/root_import_ems_ems-event-submission.wgpkg b/docs/upgrades/packages-7.9.9/root_import_ems_ems-event-submission.wgpkg
deleted file mode 100644
index 28cd8e598..000000000
Binary files a/docs/upgrades/packages-7.9.9/root_import_ems_ems-event-submission.wgpkg and /dev/null differ
diff --git a/docs/upgrades/packages-7.9.9/stockdatatmpl000000001.wgpkg b/docs/upgrades/packages-7.9.9/stockdatatmpl000000001.wgpkg
deleted file mode 100644
index 82f753636..000000000
Binary files a/docs/upgrades/packages-7.9.9/stockdatatmpl000000001.wgpkg and /dev/null differ
diff --git a/docs/upgrades/upgrade_7.9.8-7.9.9.pl b/docs/upgrades/upgrade_7.9.8-7.9.9.pl
deleted file mode 100644
index 345363604..000000000
--- a/docs/upgrades/upgrade_7.9.8-7.9.9.pl
+++ /dev/null
@@ -1,199 +0,0 @@
-#!/usr/bin/env perl
-
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2009 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-our ($webguiRoot);
-
-BEGIN {
-    $webguiRoot = "../..";
-    unshift (@INC, $webguiRoot."/lib");
-}
-
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-use WebGUI::Storage;
-use WebGUI::Asset;
-use WebGUI::ProfileField;
-
-
-my $toVersion = '7.9.9';
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-migrateAttachmentsToJson( $session );
-addIndexToUserSessionLog($session);
-addHeightToCarousel($session);
-synchronizeUserProfileTables($session);
-
-finish($session); # this line required
-
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-#sub exampleFunction {
-#    my $session = shift;
-#    print "\tWe're doing some stuff here that you should know about... " unless $quiet;
-#    # and here's our code
-#    print "DONE!\n" unless $quiet;
-#}
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-sub addIndexToUserSessionLog {
-    my $session = shift;
-    print "\tAdd index to UserSessionLogTable... " unless $quiet;
-    $session->db->write(q|alter table userLoginLog add index sessionId (sessionId)|);
-    print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-sub addHeightToCarousel {
-    my $session = shift;
-    print "\tAdd slide height to Carousel... " unless $quiet;
-    $session->db->write(q|alter table Carousel add column slideHeight int(11)|);
-    print "DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-sub synchronizeUserProfileTables {
-    my $session = shift;
-    print "\tMake sure that userProfileField, and userProfileData tables are aligned correctly... " unless $quiet;
-    my $dbh         = $session->db->dbh;
-    my $fields = WebGUI::ProfileField->getFields($session);
-    foreach my $field ( @{ $fields } ) {
-        my $columnInfo = $dbh->column_info(undef, undef, 'userProfileData', $field->getId)->fetchrow_hashref();
-        if (! $columnInfo) {
-            printf "\n\t\tDeleting broken field: %s", $field->getId;
-            $session->db->deleteRow('userProfileField', 'fieldName', $field->getId);
-        }
-    }
-
-    print "  ...DONE!\n" unless $quiet;
-}
-
-#----------------------------------------------------------------------------
-# Move Template attachments to JSON collateral
-sub migrateAttachmentsToJson {
-    my $session = shift;
-    print "\tMoving template attachments to JSON... " unless $quiet;
-    # and here's our code
-    $session->db->write(
-        "ALTER TABLE template ADD attachmentsJson LONGTEXT"
-    );
-
-    my $attach;     # hashref (template) of hashrefs (revisionDate)
-                    # of arrayrefs (attachments) of hashrefs (attachment)
-    my $sth = $session->db->read( "SELECT * FROM template_attachments" );
-    while ( my $row = $sth->hashRef ) {
-        push @{ $attach->{ $row->{templateId} }{ $row->{revisionDate} } }, {
-            url         => $row->{url},
-            type        => $row->{type},
-        };
-    }
-
-    for my $templateId ( keys %{ $attach } ) {
-        for my $revisionDate ( keys %{ $attach->{$templateId} } ) {
-            my $data    = $attach->{$templateId}{$revisionDate};
-            my $asset   = WebGUI::Asset->newByDynamicClass( $session, $templateId, $revisionDate );
-            $asset->update({ attachmentsJson => JSON->new->encode( $data ) });
-        }
-    }
-
-    $session->db->write(
-        "DROP TABLE template_attachments"
-    );
-
-    print "DONE!\n" unless $quiet;
-}
-
-# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
-
-#----------------------------------------------------------------------------
-# Add a package to the import node
-sub addPackage {
-    my $session     = shift;
-    my $file        = shift;
-
-    print "\tUpgrading package $file\n" unless $quiet;
-    # Make a storage location for the package
-    my $storage     = WebGUI::Storage->createTemp( $session );
-    $storage->addFileFromFilesystem( $file );
-
-    # Import the package into the import node
-    my $package = eval {
-        my $node = WebGUI::Asset->getImportNode($session);
-        $node->importPackage( $storage, {
-            overwriteLatest    => 1,
-            clearPackageFlag   => 1,
-            setDefaultTemplate => 1,
-        } );
-    };
-
-    if ($package eq 'corrupt') {
-        die "Corrupt package found in $file.  Stopping upgrade.\n";
-    }
-    if ($@ || !defined $package) {
-        die "Error during package import on $file: $@\nStopping upgrade\n.";
-    }
-
-    return;
-}
-
-#-------------------------------------------------
-sub start {
-    my $configFile;
-    $|=1; #disable output buffering
-    GetOptions(
-        'configFile=s'=>\$configFile,
-        'quiet'=>\$quiet
-    );
-    my $session = WebGUI::Session->open($webguiRoot,$configFile);
-    $session->user({userId=>3});
-    my $versionTag = WebGUI::VersionTag->getWorking($session);
-    $versionTag->set({name=>"Upgrade to ".$toVersion});
-    return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-    my $session = shift;
-    updateTemplates($session);
-    migrateAttachmentsToJson( $session );
-    my $versionTag = WebGUI::VersionTag->getWorking($session);
-    $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
-    $session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-    my $session = shift;
-    return undef unless (-d "packages-".$toVersion);
-    print "\tUpdating packages.\n" unless ($quiet);
-    opendir(DIR,"packages-".$toVersion);
-    my @files = readdir(DIR);
-    closedir(DIR);
-    my $newFolder = undef;
-    foreach my $file (@files) {
-        next unless ($file =~ /\.wgpkg$/);
-        # Fix the filename to include a path
-        $file       = "packages-" . $toVersion . "/" . $file;
-        addPackage( $session, $file );
-    }
-}
-
-#vim:ft=perl
diff --git a/docs/upgrades/upgrade_7.9.9-7.9.10.pl b/docs/upgrades/upgrade_7.9.9-7.9.10.pl
deleted file mode 100644
index e21d15b1b..000000000
--- a/docs/upgrades/upgrade_7.9.9-7.9.10.pl
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/env perl
-
-#-------------------------------------------------------------------
-# WebGUI is Copyright 2001-2009 Plain Black Corporation.
-#-------------------------------------------------------------------
-# Please read the legal notices (docs/legal.txt) and the license
-# (docs/license.txt) that came with this distribution before using
-# this software.
-#-------------------------------------------------------------------
-# http://www.plainblack.com                     info@plainblack.com
-#-------------------------------------------------------------------
-
-our ($webguiRoot);
-
-BEGIN {
-    $webguiRoot = "../..";
-    unshift (@INC, $webguiRoot."/lib");
-}
-
-use strict;
-use Getopt::Long;
-use WebGUI::Session;
-use WebGUI::Storage;
-use WebGUI::Asset;
-
-
-my $toVersion = '7.9.10';
-my $quiet; # this line required
-
-
-my $session = start(); # this line required
-
-# upgrade functions go here
-
-finish($session); # this line required
-
-
-#----------------------------------------------------------------------------
-# Describe what our function does
-#sub exampleFunction {
-#    my $session = shift;
-#    print "\tWe're doing some stuff here that you should know about... " unless $quiet;
-#    # and here's our code
-#    print "DONE!\n" unless $quiet;
-#}
-
-
-# -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
-
-#----------------------------------------------------------------------------
-# Add a package to the import node
-sub addPackage {
-    my $session     = shift;
-    my $file        = shift;
-
-    print "\tUpgrading package $file\n" unless $quiet;
-    # Make a storage location for the package
-    my $storage     = WebGUI::Storage->createTemp( $session );
-    $storage->addFileFromFilesystem( $file );
-
-    # Import the package into the import node
-    my $package = eval {
-        my $node = WebGUI::Asset->getImportNode($session);
-        $node->importPackage( $storage, {
-            overwriteLatest    => 1,
-            clearPackageFlag   => 1,
-            setDefaultTemplate => 1,
-        } );
-    };
-
-    if ($package eq 'corrupt') {
-        die "Corrupt package found in $file.  Stopping upgrade.\n";
-    }
-    if ($@ || !defined $package) {
-        die "Error during package import on $file: $@\nStopping upgrade\n.";
-    }
-
-    return;
-}
-
-#-------------------------------------------------
-sub start {
-    my $configFile;
-    $|=1; #disable output buffering
-    GetOptions(
-        'configFile=s'=>\$configFile,
-        'quiet'=>\$quiet
-    );
-    my $session = WebGUI::Session->open($webguiRoot,$configFile);
-    $session->user({userId=>3});
-    my $versionTag = WebGUI::VersionTag->getWorking($session);
-    $versionTag->set({name=>"Upgrade to ".$toVersion});
-    return $session;
-}
-
-#-------------------------------------------------
-sub finish {
-    my $session = shift;
-    updateTemplates($session);
-    my $versionTag = WebGUI::VersionTag->getWorking($session);
-    $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
-    $session->close();
-}
-
-#-------------------------------------------------
-sub updateTemplates {
-    my $session = shift;
-    return undef unless (-d "packages-".$toVersion);
-    print "\tUpdating packages.\n" unless ($quiet);
-    opendir(DIR,"packages-".$toVersion);
-    my @files = readdir(DIR);
-    closedir(DIR);
-    my $newFolder = undef;
-    foreach my $file (@files) {
-        next unless ($file =~ /\.wgpkg$/);
-        # Fix the filename to include a path
-        $file       = "packages-" . $toVersion . "/" . $file;
-        addPackage( $session, $file );
-    }
-}
-
-#vim:ft=perl
diff --git a/share/upgrades/7.9.10-8.0.0/addMaintenancePageToConfig.pl b/share/upgrades/7.9.10-8.0.0/addMaintenancePageToConfig.pl
new file mode 100644
index 000000000..e35052024
--- /dev/null
+++ b/share/upgrades/7.9.10-8.0.0/addMaintenancePageToConfig.pl
@@ -0,0 +1,14 @@
+use WebGUI::Upgrade::Script;
+
+use File::Basename;
+use Cwd qw(realpath);
+use File::Spec::Functions;
+use WebGUI::Paths;
+
+start_step "Moving preload files";
+
+my $webgui_root = realpath( catdir( dirname( $INC{'WebGUI/Upgrade/Script.pm'} ), (updir) x 3 ) );
+
+config->set('maintenancePage', catfile( $webgui_root, 'www', 'maintenance.html' ));
+
+done;
diff --git a/share/upgrades/7.9.10-8.0.0/migrateToNewCache.pl b/share/upgrades/7.9.10-8.0.0/migrateToNewCache.pl
new file mode 100644
index 000000000..5241484e0
--- /dev/null
+++ b/share/upgrades/7.9.10-8.0.0/migrateToNewCache.pl
@@ -0,0 +1,36 @@
+use WebGUI::Upgrade::Script;
+use Module::Find;
+
+start_step "Migrating to new cache";
+
+rm_lib
+    findallmod('WebGUI::Cache'),
+    'WebGUI::Workflow::Activity::CleanDatabaseCache',
+    'WebGUI::Workflow::Activity::CleanFileCache',
+;
+
+config->set("cache", {
+    'driver'            => 'FastMmap',
+    'expires_variance'  => '0.10',
+    'root_dir'          => '/tmp/WebGUICache',
+});
+
+config->set('hotSessionFlushToDb', 600);
+config->delete('disableCache');
+config->delete('cacheType');
+config->delete('fileCacheRoot');
+config->deleteFromArray('workflowActivities/None', 'WebGUI::Workflow::Activity::CleanDatabaseCache');
+config->deleteFromArray('workflowActivities/None', 'WebGUI::Workflow::Activity::CleanFileCache');
+
+sql 'DROP TABLE IF EXISTS cache';
+sql 'DELETE FROM WorkflowActivity WHERE className in (?,?)',
+        'WebGUI::Workflow::Activity::CleanDatabaseCache',
+        'WebGUI::Workflow::Activity::CleanFileCache',
+;
+sql 'DELETE FROM WorkflowActivityData WHERE activityId IN (?,?)',
+        'pbwfactivity0000000002',
+        'pbwfactivity0000000022',
+;
+
+done;
+
diff --git a/share/upgrades/7.9.10-8.0.0/moveFileLocations.pl b/share/upgrades/7.9.10-8.0.0/moveFileLocations.pl
new file mode 100644
index 000000000..f468869c7
--- /dev/null
+++ b/share/upgrades/7.9.10-8.0.0/moveFileLocations.pl
@@ -0,0 +1,20 @@
+use WebGUI::Upgrade::Script;
+
+use File::Basename;
+use Cwd qw(realpath);
+use File::Spec::Functions;
+use WebGUI::Paths;
+
+start_step "Moving preload files";
+
+my $webgui_root = realpath( catdir( dirname( $INC{'WebGUI/Upgrade/Script.pm'} ), (updir) x 3 ) );
+
+unlink catfile($webgui_root, 'lib', 'default.ttf');
+
+unlink catfile($webgui_root, 'sbin', 'preload.custom.example');
+unlink catfile($webgui_root, 'sbin', 'preload.exclude.example');
+
+rename catfile($webgui_root, 'sbin', 'preload.custom'), WebGUI::Paths->preloadCustom;
+rename catfile($webgui_root, 'sbin', 'preload.exclude'), WebGUI::Paths->preloadExclusions;
+
+done;
diff --git a/share/upgrades/7.9.10-8.0.0/moveMaintenance.pl b/share/upgrades/7.9.10-8.0.0/moveMaintenance.pl
new file mode 100644
index 000000000..0c9fdc26a
--- /dev/null
+++ b/share/upgrades/7.9.10-8.0.0/moveMaintenance.pl
@@ -0,0 +1,13 @@
+use WebGUI::Upgrade::Script;
+
+use File::Spec::Functions;
+use File::Basename;
+use Cwd qw(realpath);
+
+my $webgui_root = realpath( catdir( dirname( $INC{'WebGUI/Upgrade/Script.pm'} ), (updir) x 3 ) );
+
+start_step "Moving maintenance file";
+
+unlink catfile($webgui_root, 'docs', 'maintenance.html');
+
+done;
diff --git a/share/upgrades/7.9.10-8.0.0/removeAdminBar.pl b/share/upgrades/7.9.10-8.0.0/removeAdminBar.pl
new file mode 100644
index 000000000..f22ac158e
--- /dev/null
+++ b/share/upgrades/7.9.10-8.0.0/removeAdminBar.pl
@@ -0,0 +1,10 @@
+
+use WebGUI::Upgrade::Script;
+
+
+report "\tRemoving Admin Bar... ";
+
+session->config->delete( 'macros/AdminBar' );
+
+
+done;
diff --git a/share/upgrades/7.9.10-8.0.0/root_import_default-asset-subscription.wgpkg b/share/upgrades/7.9.10-8.0.0/root_import_default-asset-subscription.wgpkg
new file mode 100644
index 000000000..f04fa276d
Binary files /dev/null and b/share/upgrades/7.9.10-8.0.0/root_import_default-asset-subscription.wgpkg differ