Start moving models/stores out of bundler