diff --git a/openfpga/src/base/annotate_pb_graph.cpp b/openfpga/src/annotation/annotate_pb_graph.cpp
similarity index 100%
rename from openfpga/src/base/annotate_pb_graph.cpp
rename to openfpga/src/annotation/annotate_pb_graph.cpp
diff --git a/openfpga/src/base/annotate_pb_graph.h b/openfpga/src/annotation/annotate_pb_graph.h
similarity index 100%
rename from openfpga/src/base/annotate_pb_graph.h
rename to openfpga/src/annotation/annotate_pb_graph.h
diff --git a/openfpga/src/base/annotate_pb_types.cpp b/openfpga/src/annotation/annotate_pb_types.cpp
similarity index 100%
rename from openfpga/src/base/annotate_pb_types.cpp
rename to openfpga/src/annotation/annotate_pb_types.cpp
diff --git a/openfpga/src/base/annotate_pb_types.h b/openfpga/src/annotation/annotate_pb_types.h
similarity index 100%
rename from openfpga/src/base/annotate_pb_types.h
rename to openfpga/src/annotation/annotate_pb_types.h
diff --git a/openfpga/src/base/check_netlist_naming_conflict.cpp b/openfpga/src/annotation/check_netlist_naming_conflict.cpp
similarity index 100%
rename from openfpga/src/base/check_netlist_naming_conflict.cpp
rename to openfpga/src/annotation/check_netlist_naming_conflict.cpp
diff --git a/openfpga/src/base/check_netlist_naming_conflict.h b/openfpga/src/annotation/check_netlist_naming_conflict.h
similarity index 100%
rename from openfpga/src/base/check_netlist_naming_conflict.h
rename to openfpga/src/annotation/check_netlist_naming_conflict.h
diff --git a/openfpga/src/base/check_pb_type_annotation.cpp b/openfpga/src/annotation/check_pb_type_annotation.cpp
similarity index 100%
rename from openfpga/src/base/check_pb_type_annotation.cpp
rename to openfpga/src/annotation/check_pb_type_annotation.cpp
diff --git a/openfpga/src/base/check_pb_type_annotation.h b/openfpga/src/annotation/check_pb_type_annotation.h
similarity index 100%
rename from openfpga/src/base/check_pb_type_annotation.h
rename to openfpga/src/annotation/check_pb_type_annotation.h
diff --git a/openfpga/src/base/vpr_netlist_annotation.cpp b/openfpga/src/annotation/vpr_netlist_annotation.cpp
similarity index 100%
rename from openfpga/src/base/vpr_netlist_annotation.cpp
rename to openfpga/src/annotation/vpr_netlist_annotation.cpp
diff --git a/openfpga/src/base/vpr_netlist_annotation.h b/openfpga/src/annotation/vpr_netlist_annotation.h
similarity index 100%
rename from openfpga/src/base/vpr_netlist_annotation.h
rename to openfpga/src/annotation/vpr_netlist_annotation.h
diff --git a/openfpga/src/base/vpr_pb_type_annotation.cpp b/openfpga/src/annotation/vpr_pb_type_annotation.cpp
similarity index 100%
rename from openfpga/src/base/vpr_pb_type_annotation.cpp
rename to openfpga/src/annotation/vpr_pb_type_annotation.cpp
diff --git a/openfpga/src/base/vpr_pb_type_annotation.h b/openfpga/src/annotation/vpr_pb_type_annotation.h
similarity index 100%
rename from openfpga/src/base/vpr_pb_type_annotation.h
rename to openfpga/src/annotation/vpr_pb_type_annotation.h