Adjust the structure for infra documentation