Fix folder structure to use ivy