And fix nested requirements after the restructure