resturcture and add CNAME
modifying many things