Update project structure for aaf/cadi