Split VCs and conslidate models

@shivaram1190, please review.