[cleanup] unarchive active code

Related to #1716 (closed)

Move active code out of archived files. This will make hard-forking less painful. I think there are a couple more things that need to move (and some moved from active to archive, see issue comments). But this gets us close to clean.