refactoring to add state as field of route models and delete company model