major restructure. Now everything under one roof. Later? dunno.