Update Dewey to become a more structured beast