Flailing a bit on structure.

Still stuck thinking in Y.App terms, which may be a huge mistake?