remove include & rename

129 files changed, 14 insertions, 17 deletions

diff --git a/chill/CMakeLists.txt b/chill/CMakeLists.txt
index 3345a8c..555f78b 100644
--- a/chill/CMakeLists.txt
+++ b/chill/CMakeLists.txt
@@ -47,7 +47,9 @@ if (DEFINED OMEGAHOME)
     link_directories(${OMEGAHOME}/lib)
     set(OMEGA_INC ${OMEGAHOME}/include)
 else()
-    set(OMEGA_INC ${PROJECT_SOURCE_DIR}/omegalib/include)
+    set(OMEGA_INC 
+        ${PROJECT_SOURCE_DIR}/omegalib/omega/include
+        ${PROJECT_SOURCE_DIR}/omegalib/codegen/include)
 endif()
 
 link_directories(${ROSEHOME}/lib ${BOOSTOME}/lib)
diff --git a/omegalib/CMakeLists.txt b/omegalib/CMakeLists.txt
index f8872b1..43a2af6 100644
--- a/omegalib/CMakeLists.txt
+++ b/omegalib/CMakeLists.txt
@@ -10,6 +10,6 @@ endif()
 
 set(OMEGAROOT ${PROJECT_SOURCE_DIR})
 
-add_subdirectory(omega_lib)
-add_subdirectory(code_gen)
-add_subdirectory(omega_calc)
+add_subdirectory(omega)
+add_subdirectory(codegen)
+add_subdirectory(omegacalc)
diff --git a/omegalib/code_gen/CMakeLists.txt b/omegalib/codegen/CMakeLists.txt
index 2c106b8..79bdcb4 100644
--- a/omegalib/code_gen/CMakeLists.txt
+++ b/omegalib/codegen/CMakeLists.txt
@@ -13,7 +13,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings")
 
 include_directories(
     include
-    ${OMEGAROOT}/omega_lib/include
+    ${OMEGAROOT}/omega/include
     ${ROSEHOME}/include/rose
     ${BOOSTHOME}/include
     )
diff --git a/omegalib/code_gen/include/code_gen/CG.h b/omegalib/codegen/include/code_gen/CG.h
index ce56768..ce56768 100644
--- a/omegalib/code_gen/include/code_gen/CG.h
+++ b/omegalib/codegen/include/code_gen/CG.h
diff --git a/omegalib/code_gen/include/code_gen/CG_outputBuilder.h b/omegalib/codegen/include/code_gen/CG_outputBuilder.h
index 2203235..2203235 100644
--- a/omegalib/code_gen/include/code_gen/CG_outputBuilder.h
+++ b/omegalib/codegen/include/code_gen/CG_outputBuilder.h
diff --git a/omegalib/code_gen/include/code_gen/CG_outputRepr.h b/omegalib/codegen/include/code_gen/CG_outputRepr.h
index 92f3d9f..92f3d9f 100644
--- a/omegalib/code_gen/include/code_gen/CG_outputRepr.h
+++ b/omegalib/codegen/include/code_gen/CG_outputRepr.h
diff --git a/omegalib/code_gen/include/code_gen/CG_roseBuilder.h b/omegalib/codegen/include/code_gen/CG_roseBuilder.h
index 93b708e..93b708e 100644
--- a/omegalib/code_gen/include/code_gen/CG_roseBuilder.h
+++ b/omegalib/codegen/include/code_gen/CG_roseBuilder.h
diff --git a/omegalib/code_gen/include/code_gen/CG_roseRepr.h b/omegalib/codegen/include/code_gen/CG_roseRepr.h
index 4861db7..4861db7 100644
--- a/omegalib/code_gen/include/code_gen/CG_roseRepr.h
+++ b/omegalib/codegen/include/code_gen/CG_roseRepr.h
diff --git a/omegalib/code_gen/include/code_gen/CG_stringBuilder.h b/omegalib/codegen/include/code_gen/CG_stringBuilder.h
index 09d3503..09d3503 100644
--- a/omegalib/code_gen/include/code_gen/CG_stringBuilder.h
+++ b/omegalib/codegen/include/code_gen/CG_stringBuilder.h
diff --git a/omegalib/code_gen/include/code_gen/CG_stringRepr.h b/omegalib/codegen/include/code_gen/CG_stringRepr.h
index a6df85d..a6df85d 100644
--- a/omegalib/code_gen/include/code_gen/CG_stringRepr.h
+++ b/omegalib/codegen/include/code_gen/CG_stringRepr.h
diff --git a/omegalib/code_gen/include/code_gen/CG_suifBuilder.h b/omegalib/codegen/include/code_gen/CG_suifBuilder.h
index 9f57e3d..9f57e3d 100644
--- a/omegalib/code_gen/include/code_gen/CG_suifBuilder.h
+++ b/omegalib/codegen/include/code_gen/CG_suifBuilder.h
diff --git a/omegalib/code_gen/include/code_gen/CG_suifRepr.h b/omegalib/codegen/include/code_gen/CG_suifRepr.h
index ce7c6cd..ce7c6cd 100644
--- a/omegalib/code_gen/include/code_gen/CG_suifRepr.h
+++ b/omegalib/codegen/include/code_gen/CG_suifRepr.h
diff --git a/omegalib/code_gen/include/code_gen/CG_utils.h b/omegalib/codegen/include/code_gen/CG_utils.h
index a6128bc..a6128bc 100755
--- a/omegalib/code_gen/include/code_gen/CG_utils.h
+++ b/omegalib/codegen/include/code_gen/CG_utils.h
diff --git a/omegalib/code_gen/include/code_gen/code_gen.h b/omegalib/codegen/include/code_gen/code_gen.h
index abfab7c..abfab7c 100644
--- a/omegalib/code_gen/include/code_gen/code_gen.h
+++ b/omegalib/codegen/include/code_gen/code_gen.h
diff --git a/omegalib/code_gen/include/code_gen/codegen.h b/omegalib/codegen/include/code_gen/codegen.h
index 469653d..469653d 100755
--- a/omegalib/code_gen/include/code_gen/codegen.h
+++ b/omegalib/codegen/include/code_gen/codegen.h
diff --git a/omegalib/code_gen/include/code_gen/codegen_error.h b/omegalib/codegen/include/code_gen/codegen_error.h
index 06ecc2b..06ecc2b 100755
--- a/omegalib/code_gen/include/code_gen/codegen_error.h
+++ b/omegalib/codegen/include/code_gen/codegen_error.h
diff --git a/omegalib/code_gen/include/code_gen/output_repr.h b/omegalib/codegen/include/code_gen/output_repr.h
index 254e71b..254e71b 100644
--- a/omegalib/code_gen/include/code_gen/output_repr.h
+++ b/omegalib/codegen/include/code_gen/output_repr.h
diff --git a/omegalib/code_gen/include/code_gen/rose_attributes.h b/omegalib/codegen/include/code_gen/rose_attributes.h
index 9766f52..9766f52 100644
--- a/omegalib/code_gen/include/code_gen/rose_attributes.h
+++ b/omegalib/codegen/include/code_gen/rose_attributes.h
diff --git a/omegalib/code_gen/src/CG.cc b/omegalib/codegen/src/CG.cc
index 42bd172..42bd172 100644
--- a/omegalib/code_gen/src/CG.cc
+++ b/omegalib/codegen/src/CG.cc
diff --git a/omegalib/code_gen/src/CG_roseBuilder.cc b/omegalib/codegen/src/CG_roseBuilder.cc
index eb16830..eb16830 100644
--- a/omegalib/code_gen/src/CG_roseBuilder.cc
+++ b/omegalib/codegen/src/CG_roseBuilder.cc
diff --git a/omegalib/code_gen/src/CG_roseRepr.cc b/omegalib/codegen/src/CG_roseRepr.cc
index 9265ab0..9265ab0 100644
--- a/omegalib/code_gen/src/CG_roseRepr.cc
+++ b/omegalib/codegen/src/CG_roseRepr.cc
diff --git a/omegalib/code_gen/src/CG_stringBuilder.cc b/omegalib/codegen/src/CG_stringBuilder.cc
index 2f9286f..2f9286f 100644
--- a/omegalib/code_gen/src/CG_stringBuilder.cc
+++ b/omegalib/codegen/src/CG_stringBuilder.cc
diff --git a/omegalib/code_gen/src/CG_utils.cc b/omegalib/codegen/src/CG_utils.cc
index d3a5f71..d3a5f71 100755
--- a/omegalib/code_gen/src/CG_utils.cc
+++ b/omegalib/codegen/src/CG_utils.cc
diff --git a/omegalib/code_gen/src/codegen.cc b/omegalib/codegen/src/codegen.cc
index 92ca702..92ca702 100755
--- a/omegalib/code_gen/src/codegen.cc
+++ b/omegalib/codegen/src/codegen.cc
diff --git a/omegalib/code_gen/src/rose_attributes.cc b/omegalib/codegen/src/rose_attributes.cc
index bb9681c..bb9681c 100644
--- a/omegalib/code_gen/src/rose_attributes.cc
+++ b/omegalib/codegen/src/rose_attributes.cc
diff --git a/omegalib/include/basic b/omegalib/include/basic
deleted file mode 120000
index 7e06c3d..0000000
--- a/omegalib/include/basic
+++ /dev/null
@@ -1 +0,0 @@
-../omega_lib/include/basic
\ No newline at end of file
diff --git a/omegalib/include/code_gen b/omegalib/include/code_gen
deleted file mode 120000
index c46afac..0000000
--- a/omegalib/include/code_gen
+++ /dev/null
@@ -1 +0,0 @@
-../code_gen/include/code_gen/
\ No newline at end of file
diff --git a/omegalib/include/omega b/omegalib/include/omega
deleted file mode 120000
index 8f80c19..0000000
--- a/omegalib/include/omega
+++ /dev/null
@@ -1 +0,0 @@
-../omega_lib/include/omega
\ No newline at end of file
diff --git a/omegalib/include/omega.h b/omegalib/include/omega.h
deleted file mode 120000
index 8be0f76..0000000
--- a/omegalib/include/omega.h
+++ /dev/null
@@ -1 +0,0 @@
-../omega_lib/include/omega.h
\ No newline at end of file
diff --git a/omegalib/omega_lib/CMakeLists.txt b/omegalib/omega/CMakeLists.txt
index c08cf5f..5bc7e0b 100644
--- a/omegalib/omega_lib/CMakeLists.txt
+++ b/omegalib/omega/CMakeLists.txt
@@ -51,7 +51,6 @@ set(FANCY_SRC
     )
 
 include_directories(
-    ${OMEGAROOT}/basic/include
     include
     )
 
diff --git a/omegalib/omega_lib/doc/interface.pdf b/omegalib/omega/doc/interface.pdf
index 7f918ae..7f918ae 100644
--- a/omegalib/omega_lib/doc/interface.pdf
+++ b/omegalib/omega/doc/interface.pdf
diff --git a/omegalib/omega_lib/include/basic/Bag.c b/omegalib/omega/include/basic/Bag.c
index c3084c1..c3084c1 100644
--- a/omegalib/omega_lib/include/basic/Bag.c
+++ b/omegalib/omega/include/basic/Bag.c
diff --git a/omegalib/omega_lib/include/basic/Bag.h b/omegalib/omega/include/basic/Bag.h
index 42285d0..42285d0 100644
--- a/omegalib/omega_lib/include/basic/Bag.h
+++ b/omegalib/omega/include/basic/Bag.h
diff --git a/omegalib/omega_lib/include/basic/BoolSet.h b/omegalib/omega/include/basic/BoolSet.h
index dc9ef83..dc9ef83 100755
--- a/omegalib/omega_lib/include/basic/BoolSet.h
+++ b/omegalib/omega/include/basic/BoolSet.h
diff --git a/omegalib/omega_lib/include/basic/Collection.h b/omegalib/omega/include/basic/Collection.h
index c7e4eef..c7e4eef 100644
--- a/omegalib/omega_lib/include/basic/Collection.h
+++ b/omegalib/omega/include/basic/Collection.h
diff --git a/omegalib/omega_lib/include/basic/Collections.h b/omegalib/omega/include/basic/Collections.h
index 1e68031..1e68031 100644
--- a/omegalib/omega_lib/include/basic/Collections.h
+++ b/omegalib/omega/include/basic/Collections.h
diff --git a/omegalib/omega_lib/include/basic/ConstString.h b/omegalib/omega/include/basic/ConstString.h
index 5149e55..5149e55 100644
--- a/omegalib/omega_lib/include/basic/ConstString.h
+++ b/omegalib/omega/include/basic/ConstString.h
diff --git a/omegalib/omega_lib/include/basic/Dynamic_Array.c b/omegalib/omega/include/basic/Dynamic_Array.c
index 0300fd8..0300fd8 100644
--- a/omegalib/omega_lib/include/basic/Dynamic_Array.c
+++ b/omegalib/omega/include/basic/Dynamic_Array.c
diff --git a/omegalib/omega_lib/include/basic/Dynamic_Array.h b/omegalib/omega/include/basic/Dynamic_Array.h
index c0bdf12..c0bdf12 100644
--- a/omegalib/omega_lib/include/basic/Dynamic_Array.h
+++ b/omegalib/omega/include/basic/Dynamic_Array.h
diff --git a/omegalib/omega_lib/include/basic/Iterator.h b/omegalib/omega/include/basic/Iterator.h
index 8975d9e..8975d9e 100644
--- a/omegalib/omega_lib/include/basic/Iterator.h
+++ b/omegalib/omega/include/basic/Iterator.h
diff --git a/omegalib/omega_lib/include/basic/Link.h b/omegalib/omega/include/basic/Link.h
index ede7a2b..ede7a2b 100644
--- a/omegalib/omega_lib/include/basic/Link.h
+++ b/omegalib/omega/include/basic/Link.h
diff --git a/omegalib/omega_lib/include/basic/List.c b/omegalib/omega/include/basic/List.c
index f05e0de..f05e0de 100644
--- a/omegalib/omega_lib/include/basic/List.c
+++ b/omegalib/omega/include/basic/List.c
diff --git a/omegalib/omega_lib/include/basic/List.h b/omegalib/omega/include/basic/List.h
index c6fc062..c6fc062 100644
--- a/omegalib/omega_lib/include/basic/List.h
+++ b/omegalib/omega/include/basic/List.h
diff --git a/omegalib/omega_lib/include/basic/Map.c b/omegalib/omega/include/basic/Map.c
index 69cc3f7..69cc3f7 100644
--- a/omegalib/omega_lib/include/basic/Map.c
+++ b/omegalib/omega/include/basic/Map.c
diff --git a/omegalib/omega_lib/include/basic/Map.h b/omegalib/omega/include/basic/Map.h
index f94a10c..f94a10c 100644
--- a/omegalib/omega_lib/include/basic/Map.h
+++ b/omegalib/omega/include/basic/Map.h
diff --git a/omegalib/omega_lib/include/basic/Section.c b/omegalib/omega/include/basic/Section.c
index 754e002..754e002 100644
--- a/omegalib/omega_lib/include/basic/Section.c
+++ b/omegalib/omega/include/basic/Section.c
diff --git a/omegalib/omega_lib/include/basic/Section.h b/omegalib/omega/include/basic/Section.h
index 60821d1..60821d1 100644
--- a/omegalib/omega_lib/include/basic/Section.h
+++ b/omegalib/omega/include/basic/Section.h
diff --git a/omegalib/omega_lib/include/basic/SimpleList.c b/omegalib/omega/include/basic/SimpleList.c
index da7de9b..da7de9b 100644
--- a/omegalib/omega_lib/include/basic/SimpleList.c
+++ b/omegalib/omega/include/basic/SimpleList.c
diff --git a/omegalib/omega_lib/include/basic/SimpleList.h b/omegalib/omega/include/basic/SimpleList.h
index a08b307..a08b307 100644
--- a/omegalib/omega_lib/include/basic/SimpleList.h
+++ b/omegalib/omega/include/basic/SimpleList.h
diff --git a/omegalib/omega_lib/include/basic/Tuple.c b/omegalib/omega/include/basic/Tuple.c
index ce99e82..ce99e82 100644
--- a/omegalib/omega_lib/include/basic/Tuple.c
+++ b/omegalib/omega/include/basic/Tuple.c
diff --git a/omegalib/omega_lib/include/basic/Tuple.h b/omegalib/omega/include/basic/Tuple.h
index 28e83bd..28e83bd 100644
--- a/omegalib/omega_lib/include/basic/Tuple.h
+++ b/omegalib/omega/include/basic/Tuple.h
diff --git a/omegalib/omega_lib/include/basic/boolset-test.cc b/omegalib/omega/include/basic/boolset-test.cc
index 5b68220..5b68220 100755
--- a/omegalib/omega_lib/include/basic/boolset-test.cc
+++ b/omegalib/omega/include/basic/boolset-test.cc
diff --git a/omegalib/omega_lib/include/basic/omega_error.h b/omegalib/omega/include/basic/omega_error.h
index e342efb..e342efb 100644
--- a/omegalib/omega_lib/include/basic/omega_error.h
+++ b/omegalib/omega/include/basic/omega_error.h
diff --git a/omegalib/omega_lib/include/basic/util.h b/omegalib/omega/include/basic/util.h
index 4e807cd..4e807cd 100644
--- a/omegalib/omega_lib/include/basic/util.h
+++ b/omegalib/omega/include/basic/util.h
diff --git a/omegalib/omega_lib/include/omega.h b/omegalib/omega/include/omega.h
index 8aa2c08..8aa2c08 100644
--- a/omegalib/omega_lib/include/omega.h
+++ b/omegalib/omega/include/omega.h
diff --git a/omegalib/omega_lib/include/omega/RelBody.h b/omegalib/omega/include/omega/RelBody.h
index 3c11702..3c11702 100644
--- a/omegalib/omega_lib/include/omega/RelBody.h
+++ b/omegalib/omega/include/omega/RelBody.h
diff --git a/omegalib/omega_lib/include/omega/Rel_map.h b/omegalib/omega/include/omega/Rel_map.h
index 5641cb3..5641cb3 100644
--- a/omegalib/omega_lib/include/omega/Rel_map.h
+++ b/omegalib/omega/include/omega/Rel_map.h
diff --git a/omegalib/omega_lib/include/omega/Relation.h b/omegalib/omega/include/omega/Relation.h
index b41bef5..b41bef5 100644
--- a/omegalib/omega_lib/include/omega/Relation.h
+++ b/omegalib/omega/include/omega/Relation.h
diff --git a/omegalib/omega_lib/include/omega/Relations.h b/omegalib/omega/include/omega/Relations.h
index 4fd81e6..4fd81e6 100644
--- a/omegalib/omega_lib/include/omega/Relations.h
+++ b/omegalib/omega/include/omega/Relations.h
diff --git a/omegalib/omega_lib/include/omega/closure.h b/omegalib/omega/include/omega/closure.h
index 67088dd..67088dd 100644
--- a/omegalib/omega_lib/include/omega/closure.h
+++ b/omegalib/omega/include/omega/closure.h
diff --git a/omegalib/omega_lib/include/omega/evac.h b/omegalib/omega/include/omega/evac.h
index a561f8c..a561f8c 100644
--- a/omegalib/omega_lib/include/omega/evac.h
+++ b/omegalib/omega/include/omega/evac.h
diff --git a/omegalib/omega_lib/include/omega/farkas.h b/omegalib/omega/include/omega/farkas.h
index e77ed66..e77ed66 100644
--- a/omegalib/omega_lib/include/omega/farkas.h
+++ b/omegalib/omega/include/omega/farkas.h
diff --git a/omegalib/omega_lib/include/omega/hull.h b/omegalib/omega/include/omega/hull.h
index 928d0c6..928d0c6 100644
--- a/omegalib/omega_lib/include/omega/hull.h
+++ b/omegalib/omega/include/omega/hull.h
diff --git a/omegalib/omega_lib/include/omega/omega_core/debugging.h b/omegalib/omega/include/omega/omega_core/debugging.h
index e217ae9..e217ae9 100644
--- a/omegalib/omega_lib/include/omega/omega_core/debugging.h
+++ b/omegalib/omega/include/omega/omega_core/debugging.h
diff --git a/omegalib/omega_lib/include/omega/omega_core/oc.h b/omegalib/omega/include/omega/omega_core/oc.h
index e4f5444..e4f5444 100644
--- a/omegalib/omega_lib/include/omega/omega_core/oc.h
+++ b/omegalib/omega/include/omega/omega_core/oc.h
diff --git a/omegalib/omega_lib/include/omega/omega_core/oc_i.h b/omegalib/omega/include/omega/omega_core/oc_i.h
index 9533a40..9533a40 100644
--- a/omegalib/omega_lib/include/omega/omega_core/oc_i.h
+++ b/omegalib/omega/include/omega/omega_core/oc_i.h
diff --git a/omegalib/omega_lib/include/omega/omega_i.h b/omegalib/omega/include/omega/omega_i.h
index e5d9230..e5d9230 100644
--- a/omegalib/omega_lib/include/omega/omega_i.h
+++ b/omegalib/omega/include/omega/omega_i.h
diff --git a/omegalib/omega_lib/include/omega/pres_cmpr.h b/omegalib/omega/include/omega/pres_cmpr.h
index fb3e6f0..fb3e6f0 100644
--- a/omegalib/omega_lib/include/omega/pres_cmpr.h
+++ b/omegalib/omega/include/omega/pres_cmpr.h
diff --git a/omegalib/omega_lib/include/omega/pres_cnstr.h b/omegalib/omega/include/omega/pres_cnstr.h
index 7b2d98d..7b2d98d 100644
--- a/omegalib/omega_lib/include/omega/pres_cnstr.h
+++ b/omegalib/omega/include/omega/pres_cnstr.h
diff --git a/omegalib/omega_lib/include/omega/pres_conj.h b/omegalib/omega/include/omega/pres_conj.h
index ea10a2c..ea10a2c 100644
--- a/omegalib/omega_lib/include/omega/pres_conj.h
+++ b/omegalib/omega/include/omega/pres_conj.h
diff --git a/omegalib/omega_lib/include/omega/pres_decl.h b/omegalib/omega/include/omega/pres_decl.h
index 7fec0bc..7fec0bc 100644
--- a/omegalib/omega_lib/include/omega/pres_decl.h
+++ b/omegalib/omega/include/omega/pres_decl.h
diff --git a/omegalib/omega_lib/include/omega/pres_dnf.h b/omegalib/omega/include/omega/pres_dnf.h
index 93d5942..93d5942 100644
--- a/omegalib/omega_lib/include/omega/pres_dnf.h
+++ b/omegalib/omega/include/omega/pres_dnf.h
diff --git a/omegalib/omega_lib/include/omega/pres_form.h b/omegalib/omega/include/omega/pres_form.h
index ed3258e..ed3258e 100644
--- a/omegalib/omega_lib/include/omega/pres_form.h
+++ b/omegalib/omega/include/omega/pres_form.h
diff --git a/omegalib/omega_lib/include/omega/pres_gen.h b/omegalib/omega/include/omega/pres_gen.h
index ba6a793..ba6a793 100644
--- a/omegalib/omega_lib/include/omega/pres_gen.h
+++ b/omegalib/omega/include/omega/pres_gen.h
diff --git a/omegalib/omega_lib/include/omega/pres_logic.h b/omegalib/omega/include/omega/pres_logic.h
index 27c4553..27c4553 100644
--- a/omegalib/omega_lib/include/omega/pres_logic.h
+++ b/omegalib/omega/include/omega/pres_logic.h
diff --git a/omegalib/omega_lib/include/omega/pres_quant.h b/omegalib/omega/include/omega/pres_quant.h
index 98c30df..98c30df 100644
--- a/omegalib/omega_lib/include/omega/pres_quant.h
+++ b/omegalib/omega/include/omega/pres_quant.h
diff --git a/omegalib/omega_lib/include/omega/pres_subs.h b/omegalib/omega/include/omega/pres_subs.h
index 8a9ee92..8a9ee92 100644
--- a/omegalib/omega_lib/include/omega/pres_subs.h
+++ b/omegalib/omega/include/omega/pres_subs.h
diff --git a/omegalib/omega_lib/include/omega/pres_tree.h b/omegalib/omega/include/omega/pres_tree.h
index ad78ad0..ad78ad0 100644
--- a/omegalib/omega_lib/include/omega/pres_tree.h
+++ b/omegalib/omega/include/omega/pres_tree.h
diff --git a/omegalib/omega_lib/include/omega/pres_var.h b/omegalib/omega/include/omega/pres_var.h
index bf60dcb..bf60dcb 100644
--- a/omegalib/omega_lib/include/omega/pres_var.h
+++ b/omegalib/omega/include/omega/pres_var.h
diff --git a/omegalib/omega_lib/include/omega/reach.h b/omegalib/omega/include/omega/reach.h
index ff4bf79..ff4bf79 100644
--- a/omegalib/omega_lib/include/omega/reach.h
+++ b/omegalib/omega/include/omega/reach.h
diff --git a/omegalib/omega_lib/src/RelBody.cc b/omegalib/omega/src/RelBody.cc
index 825b153..825b153 100644
--- a/omegalib/omega_lib/src/RelBody.cc
+++ b/omegalib/omega/src/RelBody.cc
diff --git a/omegalib/omega_lib/src/RelVar.cc b/omegalib/omega/src/RelVar.cc
index d9b977c..d9b977c 100644
--- a/omegalib/omega_lib/src/RelVar.cc
+++ b/omegalib/omega/src/RelVar.cc
diff --git a/omegalib/omega_lib/src/Relation.cc b/omegalib/omega/src/Relation.cc
index 1cca43a..1cca43a 100644
--- a/omegalib/omega_lib/src/Relation.cc
+++ b/omegalib/omega/src/Relation.cc
diff --git a/omegalib/omega_lib/src/Relations.cc b/omegalib/omega/src/Relations.cc
index d7dbe86..d7dbe86 100644
--- a/omegalib/omega_lib/src/Relations.cc
+++ b/omegalib/omega/src/Relations.cc
diff --git a/omegalib/omega_lib/src/basic/ConstString.cc b/omegalib/omega/src/basic/ConstString.cc
index 7d2ec1e..7d2ec1e 100644
--- a/omegalib/omega_lib/src/basic/ConstString.cc
+++ b/omegalib/omega/src/basic/ConstString.cc
diff --git a/omegalib/omega_lib/src/basic/Link.cc b/omegalib/omega/src/basic/Link.cc
index 50b9441..50b9441 100644
--- a/omegalib/omega_lib/src/basic/Link.cc
+++ b/omegalib/omega/src/basic/Link.cc
diff --git a/omegalib/omega_lib/src/closure.cc b/omegalib/omega/src/closure.cc
index 416a3e7..416a3e7 100644
--- a/omegalib/omega_lib/src/closure.cc
+++ b/omegalib/omega/src/closure.cc
diff --git a/omegalib/omega_lib/src/evac.cc b/omegalib/omega/src/evac.cc
index ff872c9..ff872c9 100644
--- a/omegalib/omega_lib/src/evac.cc
+++ b/omegalib/omega/src/evac.cc
diff --git a/omegalib/omega_lib/src/farkas.cc b/omegalib/omega/src/farkas.cc
index 1b3ef87..1b3ef87 100644
--- a/omegalib/omega_lib/src/farkas.cc
+++ b/omegalib/omega/src/farkas.cc
diff --git a/omegalib/omega_lib/src/hull.cc b/omegalib/omega/src/hull.cc
index f1b0601..f1b0601 100644
--- a/omegalib/omega_lib/src/hull.cc
+++ b/omegalib/omega/src/hull.cc
diff --git a/omegalib/omega_lib/src/hull_legacy.cc b/omegalib/omega/src/hull_legacy.cc
index a59d34f..a59d34f 100755
--- a/omegalib/omega_lib/src/hull_legacy.cc
+++ b/omegalib/omega/src/hull_legacy.cc
diff --git a/omegalib/omega_lib/src/hull_simple.cc b/omegalib/omega/src/hull_simple.cc
index 62dcb26..62dcb26 100755
--- a/omegalib/omega_lib/src/hull_simple.cc
+++ b/omegalib/omega/src/hull_simple.cc
diff --git a/omegalib/omega_lib/src/omega_core/oc.cc b/omegalib/omega/src/omega_core/oc.cc
index 0dc9b49..0dc9b49 100644
--- a/omegalib/omega_lib/src/omega_core/oc.cc
+++ b/omegalib/omega/src/omega_core/oc.cc
diff --git a/omegalib/omega_lib/src/omega_core/oc_eq.cc b/omegalib/omega/src/omega_core/oc_eq.cc
index dc595ea..dc595ea 100644
--- a/omegalib/omega_lib/src/omega_core/oc_eq.cc
+++ b/omegalib/omega/src/omega_core/oc_eq.cc
diff --git a/omegalib/omega_lib/src/omega_core/oc_exp_kill.cc b/omegalib/omega/src/omega_core/oc_exp_kill.cc
index fdb2718..fdb2718 100644
--- a/omegalib/omega_lib/src/omega_core/oc_exp_kill.cc
+++ b/omegalib/omega/src/omega_core/oc_exp_kill.cc
diff --git a/omegalib/omega_lib/src/omega_core/oc_global.cc b/omegalib/omega/src/omega_core/oc_global.cc
index 17d8a0c..17d8a0c 100644
--- a/omegalib/omega_lib/src/omega_core/oc_global.cc
+++ b/omegalib/omega/src/omega_core/oc_global.cc
diff --git a/omegalib/omega_lib/src/omega_core/oc_print.cc b/omegalib/omega/src/omega_core/oc_print.cc
index 7934713..7934713 100644
--- a/omegalib/omega_lib/src/omega_core/oc_print.cc
+++ b/omegalib/omega/src/omega_core/oc_print.cc
diff --git a/omegalib/omega_lib/src/omega_core/oc_problems.cc b/omegalib/omega/src/omega_core/oc_problems.cc
index 8b6e04c..8b6e04c 100644
--- a/omegalib/omega_lib/src/omega_core/oc_problems.cc
+++ b/omegalib/omega/src/omega_core/oc_problems.cc
diff --git a/omegalib/omega_lib/src/omega_core/oc_query.cc b/omegalib/omega/src/omega_core/oc_query.cc
index 528b297..528b297 100644
--- a/omegalib/omega_lib/src/omega_core/oc_query.cc
+++ b/omegalib/omega/src/omega_core/oc_query.cc
diff --git a/omegalib/omega_lib/src/omega_core/oc_quick_kill.cc b/omegalib/omega/src/omega_core/oc_quick_kill.cc
index 1b988d4..1b988d4 100644
--- a/omegalib/omega_lib/src/omega_core/oc_quick_kill.cc
+++ b/omegalib/omega/src/omega_core/oc_quick_kill.cc
diff --git a/omegalib/omega_lib/src/omega_core/oc_simple.cc b/omegalib/omega/src/omega_core/oc_simple.cc
index 0e492db..0e492db 100644
--- a/omegalib/omega_lib/src/omega_core/oc_simple.cc
+++ b/omegalib/omega/src/omega_core/oc_simple.cc
diff --git a/omegalib/omega_lib/src/omega_core/oc_solve.cc b/omegalib/omega/src/omega_core/oc_solve.cc
index c25b6d0..c25b6d0 100644
--- a/omegalib/omega_lib/src/omega_core/oc_solve.cc
+++ b/omegalib/omega/src/omega_core/oc_solve.cc
diff --git a/omegalib/omega_lib/src/omega_core/oc_util.cc b/omegalib/omega/src/omega_core/oc_util.cc
index a7d21be..a7d21be 100644
--- a/omegalib/omega_lib/src/omega_core/oc_util.cc
+++ b/omegalib/omega/src/omega_core/oc_util.cc
diff --git a/omegalib/omega_lib/src/pres_beaut.cc b/omegalib/omega/src/pres_beaut.cc
index c23962a..c23962a 100644
--- a/omegalib/omega_lib/src/pres_beaut.cc
+++ b/omegalib/omega/src/pres_beaut.cc
diff --git a/omegalib/omega_lib/src/pres_cnstr.cc b/omegalib/omega/src/pres_cnstr.cc
index a8ebd15..a8ebd15 100644
--- a/omegalib/omega_lib/src/pres_cnstr.cc
+++ b/omegalib/omega/src/pres_cnstr.cc
diff --git a/omegalib/omega_lib/src/pres_col.cc b/omegalib/omega/src/pres_col.cc
index 1569116..1569116 100644
--- a/omegalib/omega_lib/src/pres_col.cc
+++ b/omegalib/omega/src/pres_col.cc
diff --git a/omegalib/omega_lib/src/pres_conj.cc b/omegalib/omega/src/pres_conj.cc
index f3f458d..f3f458d 100644
--- a/omegalib/omega_lib/src/pres_conj.cc
+++ b/omegalib/omega/src/pres_conj.cc
diff --git a/omegalib/omega_lib/src/pres_decl.cc b/omegalib/omega/src/pres_decl.cc
index f5ac312..f5ac312 100644
--- a/omegalib/omega_lib/src/pres_decl.cc
+++ b/omegalib/omega/src/pres_decl.cc
diff --git a/omegalib/omega_lib/src/pres_dnf.cc b/omegalib/omega/src/pres_dnf.cc
index c9fd7e6..c9fd7e6 100644
--- a/omegalib/omega_lib/src/pres_dnf.cc
+++ b/omegalib/omega/src/pres_dnf.cc
diff --git a/omegalib/omega_lib/src/pres_form.cc b/omegalib/omega/src/pres_form.cc
index 82b710b..82b710b 100644
--- a/omegalib/omega_lib/src/pres_form.cc
+++ b/omegalib/omega/src/pres_form.cc
diff --git a/omegalib/omega_lib/src/pres_gen.cc b/omegalib/omega/src/pres_gen.cc
index 0f05d40..0f05d40 100644
--- a/omegalib/omega_lib/src/pres_gen.cc
+++ b/omegalib/omega/src/pres_gen.cc
diff --git a/omegalib/omega_lib/src/pres_logic.cc b/omegalib/omega/src/pres_logic.cc
index 8ee90f1..8ee90f1 100644
--- a/omegalib/omega_lib/src/pres_logic.cc
+++ b/omegalib/omega/src/pres_logic.cc
diff --git a/omegalib/omega_lib/src/pres_print.cc b/omegalib/omega/src/pres_print.cc
index 4f2cd0d..4f2cd0d 100644
--- a/omegalib/omega_lib/src/pres_print.cc
+++ b/omegalib/omega/src/pres_print.cc
diff --git a/omegalib/omega_lib/src/pres_quant.cc b/omegalib/omega/src/pres_quant.cc
index 5483bad..5483bad 100644
--- a/omegalib/omega_lib/src/pres_quant.cc
+++ b/omegalib/omega/src/pres_quant.cc
diff --git a/omegalib/omega_lib/src/pres_rear.cc b/omegalib/omega/src/pres_rear.cc
index 508959d..508959d 100644
--- a/omegalib/omega_lib/src/pres_rear.cc
+++ b/omegalib/omega/src/pres_rear.cc
diff --git a/omegalib/omega_lib/src/pres_subs.cc b/omegalib/omega/src/pres_subs.cc
index 9854b09..9854b09 100644
--- a/omegalib/omega_lib/src/pres_subs.cc
+++ b/omegalib/omega/src/pres_subs.cc
diff --git a/omegalib/omega_lib/src/pres_var.cc b/omegalib/omega/src/pres_var.cc
index 0ec406f..0ec406f 100644
--- a/omegalib/omega_lib/src/pres_var.cc
+++ b/omegalib/omega/src/pres_var.cc
diff --git a/omegalib/omega_lib/src/reach.cc b/omegalib/omega/src/reach.cc
index bde785c..bde785c 100644
--- a/omegalib/omega_lib/src/reach.cc
+++ b/omegalib/omega/src/reach.cc
diff --git a/omegalib/omega_calc/CMakeLists.txt b/omegalib/omegacalc/CMakeLists.txt
index 546780b..05e2988 100644
--- a/omegalib/omega_calc/CMakeLists.txt
+++ b/omegalib/omegacalc/CMakeLists.txt
@@ -10,15 +10,15 @@ ADD_FLEX_BISON_DEPENDENCY(OCScanner OCParser)
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
     include
-    ${OMEGAROOT}/omega_lib/include
-    ${OMEGAROOT}/code_gen/include
+    ${OMEGAROOT}/omega/include
+    ${OMEGAROOT}/codegen/include
     )
 
 string(TIMESTAMP build_date "\\\"%m/%d/%Y\\\"")
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBUILD_CODEGEN -DOC_VERSION=\"\\\"OC_VERSION\\\"\" -DOC_BUILD_DATE=\"${build_date}\"")
 
-add_executable(omega_calc
+add_executable(omegacalc
     EXCLUDE_FROM_ALL
     src/AST.cc
     src/myflex.cc
@@ -26,9 +26,9 @@ add_executable(omega_calc
     ${BISON_OCParser_OUTPUTS}
     )
 
-add_dependencies(omega_calc omega codegen)
-target_link_libraries(omega_calc omega codegen)
+add_dependencies(omegacalc omega codegen)
+target_link_libraries(omegacalc omega codegen)
 
-install(TARGETS omega_calc
+install(TARGETS omegacalc
         DESTINATION bin
-        COMPONENT omega_calc OPTIONAL)
+        COMPONENT omegacalc OPTIONAL)
diff --git a/omegalib/omega_calc/doc/calculator.pdf b/omegalib/omegacalc/doc/calculator.pdf
index 5c307ab..5c307ab 100644
--- a/omegalib/omega_calc/doc/calculator.pdf
+++ b/omegalib/omegacalc/doc/calculator.pdf
diff --git a/omegalib/omega_calc/include/omega_calc/AST.h b/omegalib/omegacalc/include/omega_calc/AST.h
index 58d74fb..58d74fb 100644
--- a/omegalib/omega_calc/include/omega_calc/AST.h
+++ b/omegalib/omegacalc/include/omega_calc/AST.h
diff --git a/omegalib/omega_calc/include/omega_calc/PT-omega.c b/omegalib/omegacalc/include/omega_calc/PT-omega.c
index ad6b979..ad6b979 100644
--- a/omegalib/omega_calc/include/omega_calc/PT-omega.c
+++ b/omegalib/omegacalc/include/omega_calc/PT-omega.c
diff --git a/omegalib/omega_calc/include/omega_calc/myflex.h b/omegalib/omegacalc/include/omega_calc/myflex.h
index d472e51..d472e51 100755
--- a/omegalib/omega_calc/include/omega_calc/myflex.h
+++ b/omegalib/omegacalc/include/omega_calc/myflex.h
diff --git a/omegalib/omega_calc/src/AST.cc b/omegalib/omegacalc/src/AST.cc
index 1f885a6..1f885a6 100644
--- a/omegalib/omega_calc/src/AST.cc
+++ b/omegalib/omegacalc/src/AST.cc
diff --git a/omegalib/omega_calc/src/myflex.cc b/omegalib/omegacalc/src/myflex.cc
index 89a2544..89a2544 100755
--- a/omegalib/omega_calc/src/myflex.cc
+++ b/omegalib/omegacalc/src/myflex.cc
diff --git a/omegalib/omega_calc/src/parser.l b/omegalib/omegacalc/src/parser.l
index ac2b448..ac2b448 100644
--- a/omegalib/omega_calc/src/parser.l
+++ b/omegalib/omegacalc/src/parser.l
diff --git a/omegalib/omega_calc/src/parser.ll b/omegalib/omegacalc/src/parser.ll
index 86de3a4..86de3a4 100755
--- a/omegalib/omega_calc/src/parser.ll
+++ b/omegalib/omegacalc/src/parser.ll
diff --git a/omegalib/omega_calc/src/parser.y b/omegalib/omegacalc/src/parser.y
index 7369b94..7369b94 100644
--- a/omegalib/omega_calc/src/parser.y
+++ b/omegalib/omegacalc/src/parser.y
diff --git a/omegalib/omega_calc/src/parser.yy b/omegalib/omegacalc/src/parser.yy
index 896f926..896f926 100755
--- a/omegalib/omega_calc/src/parser.yy
+++ b/omegalib/omegacalc/src/parser.yy