diff --git a/bird/config.go b/bird/config.go
index 61c1572..88e3ce4 100644
--- a/bird/config.go
+++ b/bird/config.go
@@ -17,6 +17,10 @@ type BirdConfig struct {
 
 type ParserConfig struct {
 	FilterFields []string `toml:"filter_fields"`
+
+	PerPeerTables      bool   `toml:"per_peer_tables"`
+	PeerProtocolPrefix string `toml:"peer_protocol_prefix"`
+	PipeProtocolPrefix string `tomo:"pipe_protocol_prefix"`
 }
 
 type RateLimitConfig struct {
@@ -24,9 +28,3 @@ type RateLimitConfig struct {
 	Max     int `toml:"requests_per_minute"`
 	Enabled bool
 }
-
-type PerPeerTablesConfig struct {
-	Enabled            bool   `toml:"enabled"`
-	PeerProtocolPrefix string `toml:"peer_protocol_prefix"`
-	PipeProtocolPrefix string `tomo:"pipe_protocol_prefix"`
-}
diff --git a/config.go b/config.go
index 69b7f4e..8a5c394 100644
--- a/config.go
+++ b/config.go
@@ -17,12 +17,11 @@ import (
 type Config struct {
 	Server endpoints.ServerConfig
 
-	Ratelimit     bird.RateLimitConfig
-	Status        bird.StatusConfig
-	Bird          bird.BirdConfig
-	Bird6         bird.BirdConfig
-	Parser        bird.ParserConfig
-	PerPeerTables bird.PerPeerTablesConfig
+	Ratelimit bird.RateLimitConfig
+	Status    bird.StatusConfig
+	Bird      bird.BirdConfig
+	Bird6     bird.BirdConfig
+	Parser    bird.ParserConfig
 }
 
 // Try to load configfiles as specified in the files