NF: I added the cd structure