marvel: general: yet another restructure/rebase