Moved things around for the new forge.