tweak mrf recovery; move "extras" to own folder