OOP Approach

OOP Approach in all files