Major reorganization. Now using Maven. Added some test code.