diff --git a/Packages/GeoWin/changes.txt b/GeoWin/changes.txt
similarity index 100%
rename from Packages/GeoWin/changes.txt
rename to GeoWin/changes.txt
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_all_furthest_neighbors_2.C b/GeoWin/demo/GeoWin/CGAL_all_furthest_neighbors_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_all_furthest_neighbors_2.C
rename to GeoWin/demo/GeoWin/CGAL_all_furthest_neighbors_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_alpha_shape_2.C b/GeoWin/demo/GeoWin/CGAL_alpha_shape_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_alpha_shape_2.C
rename to GeoWin/demo/GeoWin/CGAL_alpha_shape_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_alpha_shape_2.hlp b/GeoWin/demo/GeoWin/CGAL_alpha_shape_2.hlp
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_alpha_shape_2.hlp
rename to GeoWin/demo/GeoWin/CGAL_alpha_shape_2.hlp
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_arrangement_2.C b/GeoWin/demo/GeoWin/CGAL_arrangement_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_arrangement_2.C
rename to GeoWin/demo/GeoWin/CGAL_arrangement_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_bops_polyholes_2.C b/GeoWin/demo/GeoWin/CGAL_bops_polyholes_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_bops_polyholes_2.C
rename to GeoWin/demo/GeoWin/CGAL_bops_polyholes_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_constrained_triang_2.C b/GeoWin/demo/GeoWin/CGAL_constrained_triang_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_constrained_triang_2.C
rename to GeoWin/demo/GeoWin/CGAL_constrained_triang_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_convex_hull_2.C b/GeoWin/demo/GeoWin/CGAL_convex_hull_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_convex_hull_2.C
rename to GeoWin/demo/GeoWin/CGAL_convex_hull_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_convex_hull_3.C b/GeoWin/demo/GeoWin/CGAL_convex_hull_3.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_convex_hull_3.C
rename to GeoWin/demo/GeoWin/CGAL_convex_hull_3.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_convex_hull_3.hlp b/GeoWin/demo/GeoWin/CGAL_convex_hull_3.hlp
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_convex_hull_3.hlp
rename to GeoWin/demo/GeoWin/CGAL_convex_hull_3.hlp
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_delaunay_triang_2.C b/GeoWin/demo/GeoWin/CGAL_delaunay_triang_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_delaunay_triang_2.C
rename to GeoWin/demo/GeoWin/CGAL_delaunay_triang_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_delaunay_triang_2.hlp b/GeoWin/demo/GeoWin/CGAL_delaunay_triang_2.hlp
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_delaunay_triang_2.hlp
rename to GeoWin/demo/GeoWin/CGAL_delaunay_triang_2.hlp
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_delaunay_triang_3.C b/GeoWin/demo/GeoWin/CGAL_delaunay_triang_3.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_delaunay_triang_3.C
rename to GeoWin/demo/GeoWin/CGAL_delaunay_triang_3.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_demo.C b/GeoWin/demo/GeoWin/CGAL_demo.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_demo.C
rename to GeoWin/demo/GeoWin/CGAL_demo.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_geometry_2.C b/GeoWin/demo/GeoWin/CGAL_geometry_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_geometry_2.C
rename to GeoWin/demo/GeoWin/CGAL_geometry_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_geometry_2.hlp b/GeoWin/demo/GeoWin/CGAL_geometry_2.hlp
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_geometry_2.hlp
rename to GeoWin/demo/GeoWin/CGAL_geometry_2.hlp
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_kdtree_2.C b/GeoWin/demo/GeoWin/CGAL_kdtree_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_kdtree_2.C
rename to GeoWin/demo/GeoWin/CGAL_kdtree_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_kdtree_3.C b/GeoWin/demo/GeoWin/CGAL_kdtree_3.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_kdtree_3.C
rename to GeoWin/demo/GeoWin/CGAL_kdtree_3.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_ler_2.C b/GeoWin/demo/GeoWin/CGAL_ler_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_ler_2.C
rename to GeoWin/demo/GeoWin/CGAL_ler_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_max_k_gon_2.C b/GeoWin/demo/GeoWin/CGAL_max_k_gon_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_max_k_gon_2.C
rename to GeoWin/demo/GeoWin/CGAL_max_k_gon_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_min_circle_2.C b/GeoWin/demo/GeoWin/CGAL_min_circle_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_min_circle_2.C
rename to GeoWin/demo/GeoWin/CGAL_min_circle_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_min_ellipse_2.C b/GeoWin/demo/GeoWin/CGAL_min_ellipse_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_min_ellipse_2.C
rename to GeoWin/demo/GeoWin/CGAL_min_ellipse_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_min_sphere_3.C b/GeoWin/demo/GeoWin/CGAL_min_sphere_3.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_min_sphere_3.C
rename to GeoWin/demo/GeoWin/CGAL_min_sphere_3.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_nef_2.C b/GeoWin/demo/GeoWin/CGAL_nef_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_nef_2.C
rename to GeoWin/demo/GeoWin/CGAL_nef_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_partition_2.C b/GeoWin/demo/GeoWin/CGAL_partition_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_partition_2.C
rename to GeoWin/demo/GeoWin/CGAL_partition_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_planar_map_2.C b/GeoWin/demo/GeoWin/CGAL_planar_map_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_planar_map_2.C
rename to GeoWin/demo/GeoWin/CGAL_planar_map_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_planar_map_2.hlp b/GeoWin/demo/GeoWin/CGAL_planar_map_2.hlp
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_planar_map_2.hlp
rename to GeoWin/demo/GeoWin/CGAL_planar_map_2.hlp
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_poly_triang_2.C b/GeoWin/demo/GeoWin/CGAL_poly_triang_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_poly_triang_2.C
rename to GeoWin/demo/GeoWin/CGAL_poly_triang_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_polygon_2.C b/GeoWin/demo/GeoWin/CGAL_polygon_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_polygon_2.C
rename to GeoWin/demo/GeoWin/CGAL_polygon_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_regular_triang_2.C b/GeoWin/demo/GeoWin/CGAL_regular_triang_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_regular_triang_2.C
rename to GeoWin/demo/GeoWin/CGAL_regular_triang_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_segment_intersection_2.C b/GeoWin/demo/GeoWin/CGAL_segment_intersection_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_segment_intersection_2.C
rename to GeoWin/demo/GeoWin/CGAL_segment_intersection_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_triangulation_2.C b/GeoWin/demo/GeoWin/CGAL_triangulation_2.C
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_triangulation_2.C
rename to GeoWin/demo/GeoWin/CGAL_triangulation_2.C
diff --git a/Packages/GeoWin/demo/GeoWin/CGAL_triangulation_2.hlp b/GeoWin/demo/GeoWin/CGAL_triangulation_2.hlp
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/CGAL_triangulation_2.hlp
rename to GeoWin/demo/GeoWin/CGAL_triangulation_2.hlp
diff --git a/Packages/GeoWin/demo/GeoWin/Makefile b/GeoWin/demo/GeoWin/Makefile
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/Makefile
rename to GeoWin/demo/GeoWin/Makefile
diff --git a/Packages/GeoWin/demo/GeoWin/Nef_2.hlp b/GeoWin/demo/GeoWin/Nef_2.hlp
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/Nef_2.hlp
rename to GeoWin/demo/GeoWin/Nef_2.hlp
diff --git a/Packages/GeoWin/demo/GeoWin/Plmap.hlp b/GeoWin/demo/GeoWin/Plmap.hlp
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/Plmap.hlp
rename to GeoWin/demo/GeoWin/Plmap.hlp
diff --git a/Packages/GeoWin/demo/GeoWin/Polyholes_2.hlp b/GeoWin/demo/GeoWin/Polyholes_2.hlp
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/Polyholes_2.hlp
rename to GeoWin/demo/GeoWin/Polyholes_2.hlp
diff --git a/Packages/GeoWin/demo/GeoWin/README b/GeoWin/demo/GeoWin/README
similarity index 100%
rename from Packages/GeoWin/demo/GeoWin/README
rename to GeoWin/demo/GeoWin/README
diff --git a/Packages/GeoWin/description.txt b/GeoWin/description.txt
similarity index 100%
rename from Packages/GeoWin/description.txt
rename to GeoWin/description.txt
diff --git a/Packages/GeoWin/doc_tex/GeoWin/GeoWin.tex b/GeoWin/doc_tex/GeoWin/GeoWin.tex
similarity index 100%
rename from Packages/GeoWin/doc_tex/GeoWin/GeoWin.tex
rename to GeoWin/doc_tex/GeoWin/GeoWin.tex
diff --git a/Packages/GeoWin/doc_tex/GeoWin/main.tex b/GeoWin/doc_tex/GeoWin/main.tex
similarity index 100%
rename from Packages/GeoWin/doc_tex/GeoWin/main.tex
rename to GeoWin/doc_tex/GeoWin/main.tex
diff --git a/Packages/GeoWin/doc_tex/GeoWin_ref/GeoWin.tex b/GeoWin/doc_tex/GeoWin_ref/GeoWin.tex
similarity index 100%
rename from Packages/GeoWin/doc_tex/GeoWin_ref/GeoWin.tex
rename to GeoWin/doc_tex/GeoWin_ref/GeoWin.tex
diff --git a/Packages/GeoWin/doc_tex/GeoWin_ref/main.tex b/GeoWin/doc_tex/GeoWin_ref/main.tex
similarity index 100%
rename from Packages/GeoWin/doc_tex/GeoWin_ref/main.tex
rename to GeoWin/doc_tex/GeoWin_ref/main.tex
diff --git a/Packages/GeoWin/doc_tex/GeoWin_ref/non_member_and_type_reg.tex b/GeoWin/doc_tex/GeoWin_ref/non_member_and_type_reg.tex
similarity index 100%
rename from Packages/GeoWin/doc_tex/GeoWin_ref/non_member_and_type_reg.tex
rename to GeoWin/doc_tex/GeoWin_ref/non_member_and_type_reg.tex
diff --git a/Packages/GeoWin/include/CGAL/geowin_support.h b/GeoWin/include/CGAL/geowin_support.h
similarity index 100%
rename from Packages/GeoWin/include/CGAL/geowin_support.h
rename to GeoWin/include/CGAL/geowin_support.h
diff --git a/Packages/GeoWin/maintainer b/GeoWin/maintainer
similarity index 100%
rename from Packages/GeoWin/maintainer
rename to GeoWin/maintainer
diff --git a/Packages/GeoWin/test/GeoWin/CGALhull.C b/GeoWin/test/GeoWin/CGALhull.C
similarity index 100%
rename from Packages/GeoWin/test/GeoWin/CGALhull.C
rename to GeoWin/test/GeoWin/CGALhull.C
diff --git a/Packages/GeoWin/test/GeoWin/CGALhull.cmd b/GeoWin/test/GeoWin/CGALhull.cmd
similarity index 100%
rename from Packages/GeoWin/test/GeoWin/CGALhull.cmd
rename to GeoWin/test/GeoWin/CGALhull.cmd
diff --git a/Packages/GeoWin/test/GeoWin/CGALsegint.C b/GeoWin/test/GeoWin/CGALsegint.C
similarity index 100%
rename from Packages/GeoWin/test/GeoWin/CGALsegint.C
rename to GeoWin/test/GeoWin/CGALsegint.C
diff --git a/Packages/GeoWin/test/GeoWin/CGALsegint.cmd b/GeoWin/test/GeoWin/CGALsegint.cmd
similarity index 100%
rename from Packages/GeoWin/test/GeoWin/CGALsegint.cmd
rename to GeoWin/test/GeoWin/CGALsegint.cmd
diff --git a/Packages/GeoWin/test/GeoWin/cgal_test b/GeoWin/test/GeoWin/cgal_test
similarity index 100%
rename from Packages/GeoWin/test/GeoWin/cgal_test
rename to GeoWin/test/GeoWin/cgal_test
diff --git a/Packages/GeoWin/test/GeoWin/makefile b/GeoWin/test/GeoWin/makefile
similarity index 100%
rename from Packages/GeoWin/test/GeoWin/makefile
rename to GeoWin/test/GeoWin/makefile