Move things around, add a classmap for plugins.