Readme update and OOP re-education