Modify genhtml to use the new organization