Revert "Current State Brand-Model Parsing"

Sorry to revert this. While I appreciate the tremendous amount of work that's been put in this PR, I'd like to consider this for a V2 rather than risk breaking tons of things here.

Going forward, there's a number of changes we need to make to the overall project organization and I feel like merging such a bing set of changes just before doing so is counterproductive.