Folder structure refactoring to isolate ivy files