Moving app to OOP