Move to OOP approach
Update changelog and version numbers