further restructuring. doom3 and roe should work again.