Change on Company OOP structure