Procedural to Object-Oriented Modules