Moving towards object-oriented programming