Updated structure within app