Chnaged to object-oriented approach with run.py as run script