diff --git a/protocols/bgp/server/BUILD.bazel b/protocols/bgp/server/BUILD.bazel
index e9ebd9630360ff10efb76e29efaf668dc227d3e8..69051e9edce1703d274334193b06b1906682f1b4 100644
--- a/protocols/bgp/server/BUILD.bazel
+++ b/protocols/bgp/server/BUILD.bazel
@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = [
-        "fsm2.go",
+        "fsm.go",
         "fsm_active.go",
         "fsm_cease.go",
         "fsm_connect.go",
@@ -32,7 +32,6 @@ go_library(
         "//routingtable:go_default_library",
         "//routingtable/adjRIBIn:go_default_library",
         "//routingtable/adjRIBOut:go_default_library",
-        "//routingtable/adjRIBOutAddPath:go_default_library",
         "//routingtable/filter:go_default_library",
         "//vendor/github.com/sirupsen/logrus:go_default_library",
     ],
diff --git a/routingtable/adjRIBIn/BUILD.bazel b/routingtable/adjRIBIn/BUILD.bazel
index 41411b2dd8235d03d864e86d1084b5373abe419a..6216861c145d1b50f23032fd42102271864449d7 100644
--- a/routingtable/adjRIBIn/BUILD.bazel
+++ b/routingtable/adjRIBIn/BUILD.bazel
@@ -9,6 +9,7 @@ go_library(
         "//net:go_default_library",
         "//route:go_default_library",
         "//routingtable:go_default_library",
+        "//routingtable/filter:go_default_library",
         "//vendor/github.com/sirupsen/logrus:go_default_library",
     ],
 )
@@ -21,6 +22,7 @@ go_test(
         "//net:go_default_library",
         "//route:go_default_library",
         "//routingtable:go_default_library",
+        "//routingtable/filter:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
     ],
 )
diff --git a/routingtable/adjRIBOut/BUILD.bazel b/routingtable/adjRIBOut/BUILD.bazel
index 8ebe90640fbf0ade96bc04f08d7dfa429b8a6d38..7186f0d890c6f222d7b99fc1c76696fa1909b4ba 100644
--- a/routingtable/adjRIBOut/BUILD.bazel
+++ b/routingtable/adjRIBOut/BUILD.bazel
@@ -1,14 +1,25 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library")
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
     name = "go_default_library",
-    srcs = ["adj_rib_out.go"],
+    srcs = [
+        "adj_rib_out.go",
+        "path_id_manager.go",
+    ],
     importpath = "github.com/bio-routing/bio-rd/routingtable/adjRIBOut",
     visibility = ["//visibility:public"],
     deps = [
         "//net:go_default_library",
         "//route:go_default_library",
         "//routingtable:go_default_library",
+        "//routingtable/filter:go_default_library",
         "//vendor/github.com/sirupsen/logrus:go_default_library",
     ],
 )
+
+go_test(
+    name = "go_default_test",
+    srcs = ["path_id_manager_test.go"],
+    embed = [":go_default_library"],
+    deps = ["//vendor/github.com/stretchr/testify/assert:go_default_library"],
+)
diff --git a/routingtable/adjRIBOutAddPath/BUILD.bazel b/routingtable/adjRIBOutAddPath/BUILD.bazel
index e37902c1bd4ffb46e15a3b30f8d6b336b71391da..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/routingtable/adjRIBOutAddPath/BUILD.bazel
+++ b/routingtable/adjRIBOutAddPath/BUILD.bazel
@@ -1,24 +0,0 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "adj_rib_out_add_path.go",
-        "path_id_manager.go",
-    ],
-    importpath = "github.com/bio-routing/bio-rd/routingtable/adjRIBOutAddPath",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//net:go_default_library",
-        "//route:go_default_library",
-        "//routingtable:go_default_library",
-        "//vendor/github.com/sirupsen/logrus:go_default_library",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["path_id_manager_test.go"],
-    embed = [":go_default_library"],
-    deps = ["//vendor/github.com/stretchr/testify/assert:go_default_library"],
-)
diff --git a/routingtable/filter/BUILD.bazel b/routingtable/filter/BUILD.bazel
index e6a772acf8ad3f6aab8faef4292a002a9b93945a..9a27beb4b87a501ff7d18880248ef2418dda2199 100644
--- a/routingtable/filter/BUILD.bazel
+++ b/routingtable/filter/BUILD.bazel
@@ -19,7 +19,6 @@ go_library(
         "//net:go_default_library",
         "//protocols/bgp/packet:go_default_library",
         "//route:go_default_library",
-        "//routingtable:go_default_library",
         "//routingtable/filter/actions:go_default_library",
     ],
 )
@@ -38,7 +37,6 @@ go_test(
         "//net:go_default_library",
         "//protocols/bgp/packet:go_default_library",
         "//route:go_default_library",
-        "//routingtable:go_default_library",
         "//routingtable/filter/actions:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
     ],