Revert "more moving files for ivy"

This reverts commit 8f0b3ee8b6ce9adec75c910443b64cf0b9ed6e2b.