first pass on structuring to mirror my app