some re-organizing and more ivy files