Consolidate settings
Change from verdor to vendor
Adding helper functions
improve and rebuild models.
mege from issue1