Update for GenericModule changes and package reorganization.