Add Company Entity and Repository
Clean up some code
Change relations between entities
Change relations between entities