Started to hange structure to OOP