Refactored company classes and company repositories