More object-oriented now.  Restructured and cleaned up the code.  Eventually to move back to the lib folder.