diff --git a/cpp/btmgr.cc b/f8/btmgr.cc
similarity index 100%
rename from cpp/btmgr.cc
rename to f8/btmgr.cc
diff --git a/cpp/btmgr.h b/f8/btmgr.h
similarity index 100%
rename from cpp/btmgr.h
rename to f8/btmgr.h
diff --git a/cpp/channel.h b/f8/channel.h
similarity index 100%
rename from cpp/channel.h
rename to f8/channel.h
diff --git a/cpp/dbpool.cc b/f8/dbpool.cc
similarity index 100%
rename from cpp/dbpool.cc
rename to f8/dbpool.cc
diff --git a/cpp/dbpool.h b/f8/dbpool.h
similarity index 100%
rename from cpp/dbpool.h
rename to f8/dbpool.h
diff --git a/cpp/dynmodule.cc b/f8/dynmodule.cc
similarity index 100%
rename from cpp/dynmodule.cc
rename to f8/dynmodule.cc
diff --git a/cpp/dynmodule.h b/f8/dynmodule.h
similarity index 100%
rename from cpp/dynmodule.h
rename to f8/dynmodule.h
diff --git a/cpp/httpclientpool.cc b/f8/httpclientpool.cc
similarity index 100%
rename from cpp/httpclientpool.cc
rename to f8/httpclientpool.cc
diff --git a/cpp/httpclientpool.h b/f8/httpclientpool.h
similarity index 100%
rename from cpp/httpclientpool.h
rename to f8/httpclientpool.h
diff --git a/cpp/im_msgid.proto b/f8/im_msgid.proto
similarity index 100%
rename from cpp/im_msgid.proto
rename to f8/im_msgid.proto
diff --git a/cpp/im_proto.proto b/f8/im_proto.proto
similarity index 100%
rename from cpp/im_proto.proto
rename to f8/im_proto.proto
diff --git a/cpp/inputgeom.cc b/f8/inputgeom.cc
similarity index 100%
rename from cpp/inputgeom.cc
rename to f8/inputgeom.cc
diff --git a/cpp/inputgeom.h b/f8/inputgeom.h
similarity index 100%
rename from cpp/inputgeom.h
rename to f8/inputgeom.h
diff --git a/cpp/msgqueue.cc b/f8/msgqueue.cc
similarity index 100%
rename from cpp/msgqueue.cc
rename to f8/msgqueue.cc
diff --git a/cpp/msgqueue.h b/f8/msgqueue.h
similarity index 100%
rename from cpp/msgqueue.h
rename to f8/msgqueue.h
diff --git a/cpp/navigation.cc b/f8/navigation.cc
similarity index 100%
rename from cpp/navigation.cc
rename to f8/navigation.cc
diff --git a/cpp/navigation.h b/f8/navigation.h
similarity index 100%
rename from cpp/navigation.h
rename to f8/navigation.h
diff --git a/cpp/navigation_handle.cc b/f8/navigation_handle.cc
similarity index 100%
rename from cpp/navigation_handle.cc
rename to f8/navigation_handle.cc
diff --git a/cpp/navigation_handle.h b/f8/navigation_handle.h
similarity index 100%
rename from cpp/navigation_handle.h
rename to f8/navigation_handle.h
diff --git a/cpp/netmsghandler.cc b/f8/netmsghandler.cc
similarity index 100%
rename from cpp/netmsghandler.cc
rename to f8/netmsghandler.cc
diff --git a/cpp/netmsghandler.h b/f8/netmsghandler.h
similarity index 100%
rename from cpp/netmsghandler.h
rename to f8/netmsghandler.h
diff --git a/cpp/protoutils.cc b/f8/protoutils.cc
similarity index 100%
rename from cpp/protoutils.cc
rename to f8/protoutils.cc
diff --git a/cpp/protoutils.h b/f8/protoutils.h
similarity index 100%
rename from cpp/protoutils.h
rename to f8/protoutils.h
diff --git a/cpp/scriptengine.cc b/f8/scriptengine.cc
similarity index 100%
rename from cpp/scriptengine.cc
rename to f8/scriptengine.cc
diff --git a/cpp/scriptengine.h b/f8/scriptengine.h
similarity index 100%
rename from cpp/scriptengine.h
rename to f8/scriptengine.h
diff --git a/cpp/tglog.cc b/f8/tglog.cc
similarity index 100%
rename from cpp/tglog.cc
rename to f8/tglog.cc
diff --git a/cpp/tglog.h b/f8/tglog.h
similarity index 100%
rename from cpp/tglog.h
rename to f8/tglog.h
diff --git a/cpp/tiledmap.cc b/f8/tiledmap.cc
similarity index 100%
rename from cpp/tiledmap.cc
rename to f8/tiledmap.cc
diff --git a/cpp/tiledmap.h b/f8/tiledmap.h
similarity index 100%
rename from cpp/tiledmap.h
rename to f8/tiledmap.h
diff --git a/cpp/types.cc b/f8/types.cc
similarity index 100%
rename from cpp/types.cc
rename to f8/types.cc
diff --git a/cpp/types.h b/f8/types.h
similarity index 100%
rename from cpp/types.h
rename to f8/types.h
diff --git a/cpp/utils.cc b/f8/utils.cc
similarity index 100%
rename from cpp/utils.cc
rename to f8/utils.cc
diff --git a/cpp/utils.h b/f8/utils.h
similarity index 100%
rename from cpp/utils.h
rename to f8/utils.h