Refactoring, repackaging, cleanup, author name fixed.