Restructure spider models structure