Started making of OOP structure