:lipstick: Structure changes to decouple view/app