Started converting to OO architecture