Converted work to OOP

I hate none oop development