Removed start of OOP for now.

The situation is tough for OOP as there is a lot to link together, and
it would be tougher with classes.