Okay, refactored it all with Marionette and we're back online. Not really using much of the marionette features yet, but we have the foundation of a proper app structure, even if it looks exactly the same still.