diff --git a/src/commands/audio_output_devices/disableoutput.rs b/src/commands/audio_output_devices/disableoutput.rs
index 54fc78c..44d030c 100644
--- a/src/commands/audio_output_devices/disableoutput.rs
+++ b/src/commands/audio_output_devices/disableoutput.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::AudioOutputId,
+    common::types::AudioOutputId,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/audio_output_devices/enableoutput.rs b/src/commands/audio_output_devices/enableoutput.rs
index e8c45ab..758ede1 100644
--- a/src/commands/audio_output_devices/enableoutput.rs
+++ b/src/commands/audio_output_devices/enableoutput.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::AudioOutputId,
+    common::types::AudioOutputId,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/audio_output_devices/outputs.rs b/src/commands/audio_output_devices/outputs.rs
index 37a9ab6..9b4e4ce 100644
--- a/src/commands/audio_output_devices/outputs.rs
+++ b/src/commands/audio_output_devices/outputs.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserResult, ResponseParserError},
-    common::AudioOutputId,
+    common::types::AudioOutputId,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, expect_property_type},
 };
diff --git a/src/commands/audio_output_devices/outputset.rs b/src/commands/audio_output_devices/outputset.rs
index f595509..2f78784 100644
--- a/src/commands/audio_output_devices/outputset.rs
+++ b/src/commands/audio_output_devices/outputset.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::AudioOutputId,
+    common::types::AudioOutputId,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/audio_output_devices/toggleoutput.rs b/src/commands/audio_output_devices/toggleoutput.rs
index 87d8ad8..46434df 100644
--- a/src/commands/audio_output_devices/toggleoutput.rs
+++ b/src/commands/audio_output_devices/toggleoutput.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::AudioOutputId,
+    common::types::AudioOutputId,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/client_to_client/channels.rs b/src/commands/client_to_client/channels.rs
index f703095..19aacdc 100644
--- a/src/commands/client_to_client/channels.rs
+++ b/src/commands/client_to_client/channels.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserResult, ResponseParserError},
-    common::ChannelName,
+    common::types::ChannelName,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, expect_property_type},
 };
diff --git a/src/commands/client_to_client/readmessages.rs b/src/commands/client_to_client/readmessages.rs
index d7b2d22..60f0ea1 100644
--- a/src/commands/client_to_client/readmessages.rs
+++ b/src/commands/client_to_client/readmessages.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserResult, ResponseParserError},
-    common::ChannelName,
+    common::types::ChannelName,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, expect_property_type},
 };
diff --git a/src/commands/client_to_client/sendmessage.rs b/src/commands/client_to_client/sendmessage.rs
index 2f6b974..f209f1a 100644
--- a/src/commands/client_to_client/sendmessage.rs
+++ b/src/commands/client_to_client/sendmessage.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::ChannelName,
+    common::types::ChannelName,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/client_to_client/subscribe.rs b/src/commands/client_to_client/subscribe.rs
index 1a8722a..424b6a6 100644
--- a/src/commands/client_to_client/subscribe.rs
+++ b/src/commands/client_to_client/subscribe.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::ChannelName,
+    common::types::ChannelName,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/client_to_client/unsubscribe.rs b/src/commands/client_to_client/unsubscribe.rs
index 200f2ca..d5be5d9 100644
--- a/src/commands/client_to_client/unsubscribe.rs
+++ b/src/commands/client_to_client/unsubscribe.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::ChannelName,
+    common::types::ChannelName,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/connection_settings/protocol_disable.rs b/src/commands/connection_settings/protocol_disable.rs
index b93efa6..adef348 100644
--- a/src/commands/connection_settings/protocol_disable.rs
+++ b/src/commands/connection_settings/protocol_disable.rs
@@ -1,7 +1,7 @@
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::Feature,
+    common::types::Feature,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/connection_settings/protocol_enable.rs b/src/commands/connection_settings/protocol_enable.rs
index b8469f7..9db44ed 100644
--- a/src/commands/connection_settings/protocol_enable.rs
+++ b/src/commands/connection_settings/protocol_enable.rs
@@ -1,7 +1,7 @@
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::Feature,
+    common::types::Feature,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/connection_settings/tag_types_disable.rs b/src/commands/connection_settings/tag_types_disable.rs
index b06d1d1..279f86c 100644
--- a/src/commands/connection_settings/tag_types_disable.rs
+++ b/src/commands/connection_settings/tag_types_disable.rs
@@ -1,7 +1,7 @@
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::TagName,
+    common::types::TagName,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/connection_settings/tag_types_enable.rs b/src/commands/connection_settings/tag_types_enable.rs
index d302127..59e352c 100644
--- a/src/commands/connection_settings/tag_types_enable.rs
+++ b/src/commands/connection_settings/tag_types_enable.rs
@@ -1,7 +1,7 @@
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::TagName,
+    common::types::TagName,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/connection_settings/tag_types_reset.rs b/src/commands/connection_settings/tag_types_reset.rs
index c750849..c6a5f23 100644
--- a/src/commands/connection_settings/tag_types_reset.rs
+++ b/src/commands/connection_settings/tag_types_reset.rs
@@ -1,7 +1,7 @@
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::TagName,
+    common::types::TagName,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/controlling_playback/play.rs b/src/commands/controlling_playback/play.rs
index bd4697f..6990490 100644
--- a/src/commands/controlling_playback/play.rs
+++ b/src/commands/controlling_playback/play.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::SongPosition,
+    common::types::SongPosition,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/controlling_playback/playid.rs b/src/commands/controlling_playback/playid.rs
index 06615f0..859d3d5 100644
--- a/src/commands/controlling_playback/playid.rs
+++ b/src/commands/controlling_playback/playid.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::SongId,
+    common::types::SongId,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/controlling_playback/seek.rs b/src/commands/controlling_playback/seek.rs
index 0b4d3b5..ba5f0bc 100644
--- a/src/commands/controlling_playback/seek.rs
+++ b/src/commands/controlling_playback/seek.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{SongPosition, TimeWithFractions},
+    common::types::{SongPosition, TimeWithFractions},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/controlling_playback/seekcur.rs b/src/commands/controlling_playback/seekcur.rs
index 243c7a3..e6ec0f9 100644
--- a/src/commands/controlling_playback/seekcur.rs
+++ b/src/commands/controlling_playback/seekcur.rs
@@ -5,7 +5,7 @@ use crate::{
         Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
         ResponseParserError,
     },
-    common::{SeekMode, TimeWithFractions},
+    common::types::{SeekMode, TimeWithFractions},
     request_tokenizer::RequestTokenizer,
 };
 
diff --git a/src/commands/controlling_playback/seekid.rs b/src/commands/controlling_playback/seekid.rs
index 32f290d..6f8c972 100644
--- a/src/commands/controlling_playback/seekid.rs
+++ b/src/commands/controlling_playback/seekid.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{SongId, TimeWithFractions},
+    common::types::{SongId, TimeWithFractions},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/music_database/albumart.rs b/src/commands/music_database/albumart.rs
index 9c9b729..859d7b2 100644
--- a/src/commands/music_database/albumart.rs
+++ b/src/commands/music_database/albumart.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{Offset, Uri},
+    common::types::{Offset, Uri},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, get_and_parse_property, get_property},
 };
diff --git a/src/commands/music_database/count.rs b/src/commands/music_database/count.rs
index 6cff71a..c7a55d8 100644
--- a/src/commands/music_database/count.rs
+++ b/src/commands/music_database/count.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::GroupType,
+    common::types::GroupType,
     filter::Filter,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, get_and_parse_property},
diff --git a/src/commands/music_database/find.rs b/src/commands/music_database/find.rs
index 290f903..180ea7f 100644
--- a/src/commands/music_database/find.rs
+++ b/src/commands/music_database/find.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{Sort, WindowRange},
+    common::types::{Sort, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
diff --git a/src/commands/music_database/findadd.rs b/src/commands/music_database/findadd.rs
index ae16d01..9087b69 100644
--- a/src/commands/music_database/findadd.rs
+++ b/src/commands/music_database/findadd.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{SongPosition, Sort, WindowRange},
+    common::types::{SongPosition, Sort, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
diff --git a/src/commands/music_database/getfingerprint.rs b/src/commands/music_database/getfingerprint.rs
index cbd67ad..37738b3 100644
--- a/src/commands/music_database/getfingerprint.rs
+++ b/src/commands/music_database/getfingerprint.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::Uri,
+    common::types::Uri,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, get_and_parse_property},
 };
diff --git a/src/commands/music_database/list.rs b/src/commands/music_database/list.rs
index c5efd54..204b31b 100644
--- a/src/commands/music_database/list.rs
+++ b/src/commands/music_database/list.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{GroupType, TagName, WindowRange},
+    common::types::{GroupType, TagName, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, expect_property_type},
diff --git a/src/commands/music_database/listall.rs b/src/commands/music_database/listall.rs
index 9ee7a4a..8c35b9e 100644
--- a/src/commands/music_database/listall.rs
+++ b/src/commands/music_database/listall.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::Uri,
+    common::types::Uri,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/music_database/listallinfo.rs b/src/commands/music_database/listallinfo.rs
index b966274..623fb4f 100644
--- a/src/commands/music_database/listallinfo.rs
+++ b/src/commands/music_database/listallinfo.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::Uri,
+    common::types::Uri,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/music_database/listfiles.rs b/src/commands/music_database/listfiles.rs
index 58226ff..2dfd922 100644
--- a/src/commands/music_database/listfiles.rs
+++ b/src/commands/music_database/listfiles.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::Uri,
+    common::types::Uri,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/music_database/lsinfo.rs b/src/commands/music_database/lsinfo.rs
index e08bf5f..495543a 100644
--- a/src/commands/music_database/lsinfo.rs
+++ b/src/commands/music_database/lsinfo.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::Uri,
+    common::types::Uri,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, expect_property_type},
 };
diff --git a/src/commands/music_database/readcomments.rs b/src/commands/music_database/readcomments.rs
index 98c6e67..17764ef 100644
--- a/src/commands/music_database/readcomments.rs
+++ b/src/commands/music_database/readcomments.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::Uri,
+    common::types::Uri,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{GenericResponseValue, ResponseAttributes},
 };
diff --git a/src/commands/music_database/readpicture.rs b/src/commands/music_database/readpicture.rs
index 4c87597..a269c97 100644
--- a/src/commands/music_database/readpicture.rs
+++ b/src/commands/music_database/readpicture.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{Offset, Uri},
+    common::types::{Offset, Uri},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{
         ResponseAttributes, get_and_parse_property, get_optional_property, get_property,
diff --git a/src/commands/music_database/rescan.rs b/src/commands/music_database/rescan.rs
index c25ccdf..eb5be15 100644
--- a/src/commands/music_database/rescan.rs
+++ b/src/commands/music_database/rescan.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserResult, ResponseParserError},
-    common::Uri,
+    common::types::Uri,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, get_and_parse_property},
 };
diff --git a/src/commands/music_database/search.rs b/src/commands/music_database/search.rs
index 610aaef..de3601d 100644
--- a/src/commands/music_database/search.rs
+++ b/src/commands/music_database/search.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{Sort, WindowRange},
+    common::types::{Sort, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
diff --git a/src/commands/music_database/searchadd.rs b/src/commands/music_database/searchadd.rs
index dad97ae..c84e14c 100644
--- a/src/commands/music_database/searchadd.rs
+++ b/src/commands/music_database/searchadd.rs
@@ -5,7 +5,7 @@ use crate::{
         Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
         ResponseParserError,
     },
-    common::{SongPosition, Sort, WindowRange},
+    common::types::{SongPosition, Sort, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
 };
diff --git a/src/commands/music_database/searchaddpl.rs b/src/commands/music_database/searchaddpl.rs
index 2258bc6..bdb2be0 100644
--- a/src/commands/music_database/searchaddpl.rs
+++ b/src/commands/music_database/searchaddpl.rs
@@ -5,7 +5,7 @@ use crate::{
         Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
         ResponseParserError,
     },
-    common::{PlaylistName, SongPosition, Sort, WindowRange},
+    common::types::{PlaylistName, SongPosition, Sort, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
 };
diff --git a/src/commands/music_database/searchcount.rs b/src/commands/music_database/searchcount.rs
index 28c229f..ab986e8 100644
--- a/src/commands/music_database/searchcount.rs
+++ b/src/commands/music_database/searchcount.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::GroupType,
+    common::types::GroupType,
     filter::Filter,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, get_and_parse_property},
diff --git a/src/commands/music_database/update.rs b/src/commands/music_database/update.rs
index 809b62f..f37ef56 100644
--- a/src/commands/music_database/update.rs
+++ b/src/commands/music_database/update.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserResult, ResponseParserError},
-    common::Uri,
+    common::types::Uri,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, get_and_parse_property},
 };
diff --git a/src/commands/partition_commands/delpartition.rs b/src/commands/partition_commands/delpartition.rs
index b3152c7..4fe6cc7 100644
--- a/src/commands/partition_commands/delpartition.rs
+++ b/src/commands/partition_commands/delpartition.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::PartitionName,
+    common::types::PartitionName,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/partition_commands/listpartitions.rs b/src/commands/partition_commands/listpartitions.rs
index cd7d51f..6da2010 100644
--- a/src/commands/partition_commands/listpartitions.rs
+++ b/src/commands/partition_commands/listpartitions.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, Request, RequestParserResult, ResponseParserError},
-    common::PartitionName,
+    common::types::PartitionName,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, expect_property_type},
 };
diff --git a/src/commands/partition_commands/newpartition.rs b/src/commands/partition_commands/newpartition.rs
index 73c69cf..23bc6a9 100644
--- a/src/commands/partition_commands/newpartition.rs
+++ b/src/commands/partition_commands/newpartition.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::PartitionName,
+    common::types::PartitionName,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/partition_commands/partition.rs b/src/commands/partition_commands/partition.rs
index b5f72ef..f64d12b 100644
--- a/src/commands/partition_commands/partition.rs
+++ b/src/commands/partition_commands/partition.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::PartitionName,
+    common::types::PartitionName,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/playback_options/consume.rs b/src/commands/playback_options/consume.rs
index aacd22e..7629163 100644
--- a/src/commands/playback_options/consume.rs
+++ b/src/commands/playback_options/consume.rs
@@ -2,7 +2,7 @@ use std::str::FromStr;
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::BoolOrOneshot,
+    common::types::BoolOrOneshot,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
@@ -20,7 +20,7 @@ impl Command for Consume {
 
     fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
         let state = match parts.next() {
-            Some(s) => crate::common::BoolOrOneshot::from_str(s)
+            Some(s) => crate::common::types::BoolOrOneshot::from_str(s)
                 .map_err(|_| RequestParserError::SyntaxError(0, s.to_owned()))?,
             None => return Err(RequestParserError::UnexpectedEOF),
         };
diff --git a/src/commands/playback_options/crossfade.rs b/src/commands/playback_options/crossfade.rs
index fa092d7..ba7f286 100644
--- a/src/commands/playback_options/crossfade.rs
+++ b/src/commands/playback_options/crossfade.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::Seconds,
+    common::types::Seconds,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/playback_options/getvol.rs b/src/commands/playback_options/getvol.rs
index deb2d5c..7966893 100644
--- a/src/commands/playback_options/getvol.rs
+++ b/src/commands/playback_options/getvol.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use crate::{
     commands::{Command, Request, RequestParserResult, ResponseParserError},
-    common::VolumeValue,
+    common::types::VolumeValue,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, get_and_parse_property},
 };
diff --git a/src/commands/playback_options/mixrampdelay.rs b/src/commands/playback_options/mixrampdelay.rs
index 3922dc7..f74c7e3 100644
--- a/src/commands/playback_options/mixrampdelay.rs
+++ b/src/commands/playback_options/mixrampdelay.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::Seconds,
+    common::types::Seconds,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/playback_options/replay_gain_mode.rs b/src/commands/playback_options/replay_gain_mode.rs
index 6f62659..a50fb34 100644
--- a/src/commands/playback_options/replay_gain_mode.rs
+++ b/src/commands/playback_options/replay_gain_mode.rs
@@ -2,7 +2,7 @@ use std::str::FromStr;
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::ReplayGainModeMode,
+    common::types::ReplayGainModeMode,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/playback_options/replay_gain_status.rs b/src/commands/playback_options/replay_gain_status.rs
index 07e64e3..cfa34b7 100644
--- a/src/commands/playback_options/replay_gain_status.rs
+++ b/src/commands/playback_options/replay_gain_status.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserResult, ResponseParserError},
-    common::ReplayGainModeMode,
+    common::types::ReplayGainModeMode,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, get_property},
 };
diff --git a/src/commands/playback_options/setvol.rs b/src/commands/playback_options/setvol.rs
index 4e5d7ba..c956f95 100644
--- a/src/commands/playback_options/setvol.rs
+++ b/src/commands/playback_options/setvol.rs
@@ -2,7 +2,7 @@ use std::str::FromStr;
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::VolumeValue,
+    common::types::VolumeValue,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/playback_options/single.rs b/src/commands/playback_options/single.rs
index f17b1d9..b26305e 100644
--- a/src/commands/playback_options/single.rs
+++ b/src/commands/playback_options/single.rs
@@ -2,7 +2,7 @@ use std::str::FromStr;
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::BoolOrOneshot,
+    common::types::BoolOrOneshot,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
@@ -20,7 +20,7 @@ impl Command for Single {
 
     fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
         let state = match parts.next() {
-            Some(s) => crate::common::BoolOrOneshot::from_str(s)
+            Some(s) => crate::common::types::BoolOrOneshot::from_str(s)
                 .map_err(|_| RequestParserError::SyntaxError(0, s.to_owned()))?,
             None => return Err(RequestParserError::UnexpectedEOF),
         };
diff --git a/src/commands/playback_options/volume.rs b/src/commands/playback_options/volume.rs
index 91570ed..ce37f72 100644
--- a/src/commands/playback_options/volume.rs
+++ b/src/commands/playback_options/volume.rs
@@ -2,7 +2,7 @@ use std::str::FromStr;
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::VolumeValue,
+    common::types::VolumeValue,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/querying_mpd_status/idle.rs b/src/commands/querying_mpd_status/idle.rs
index cdb0d36..dede02b 100644
--- a/src/commands/querying_mpd_status/idle.rs
+++ b/src/commands/querying_mpd_status/idle.rs
@@ -2,7 +2,7 @@ use std::str::FromStr;
 
 use crate::{
     commands::{Command, Request, RequestParserResult, ResponseParserError},
-    common::SubSystem,
+    common::types::SubSystem,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/querying_mpd_status/status.rs b/src/commands/querying_mpd_status/status.rs
index af49aa8..828e900 100644
--- a/src/commands/querying_mpd_status/status.rs
+++ b/src/commands/querying_mpd_status/status.rs
@@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserResult, ResponseParserError},
-    common::{Audio, BoolOrOneshot, SongId, SongPosition},
+    common::types::{Audio, BoolOrOneshot, SongId, SongPosition},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{
         GenericResponseValue, ResponseAttributes, get_and_parse_optional_property,
diff --git a/src/commands/queue/add.rs b/src/commands/queue/add.rs
index a5a48f3..f656608 100644
--- a/src/commands/queue/add.rs
+++ b/src/commands/queue/add.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{SongPosition, Uri},
+    common::types::{SongPosition, Uri},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/queue/addid.rs b/src/commands/queue/addid.rs
index a8a37c7..917cf9b 100644
--- a/src/commands/queue/addid.rs
+++ b/src/commands/queue/addid.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{SongId, SongPosition, Uri},
+    common::types::{SongId, SongPosition, Uri},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, get_next_and_parse_property},
 };
diff --git a/src/commands/queue/addtagid.rs b/src/commands/queue/addtagid.rs
index aeefe83..3b486ab 100644
--- a/src/commands/queue/addtagid.rs
+++ b/src/commands/queue/addtagid.rs
@@ -5,7 +5,7 @@ use crate::{
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    common::{SongId, TagName, TagValue},
+    common::types::{SongId, TagName, TagValue},
     request_tokenizer::RequestTokenizer,
 };
 
diff --git a/src/commands/queue/cleartagid.rs b/src/commands/queue/cleartagid.rs
index f35f64b..ab9e3ca 100644
--- a/src/commands/queue/cleartagid.rs
+++ b/src/commands/queue/cleartagid.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{SongId, TagName},
+    common::types::{SongId, TagName},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/queue/delete.rs b/src/commands/queue/delete.rs
index 9ce9938..5d19894 100644
--- a/src/commands/queue/delete.rs
+++ b/src/commands/queue/delete.rs
@@ -3,7 +3,7 @@ use std::str::FromStr;
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::OneOrRange,
+    common::types::OneOrRange,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/queue/deleteid.rs b/src/commands/queue/deleteid.rs
index 9a5fadf..d74c2ac 100644
--- a/src/commands/queue/deleteid.rs
+++ b/src/commands/queue/deleteid.rs
@@ -1,7 +1,7 @@
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::SongId,
+    common::types::SongId,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/queue/move_.rs b/src/commands/queue/move_.rs
index 18686c3..ea8023a 100644
--- a/src/commands/queue/move_.rs
+++ b/src/commands/queue/move_.rs
@@ -5,7 +5,7 @@ use crate::{
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    common::{AbsouluteRelativeSongPosition, OneOrRange},
+    common::types::{AbsouluteRelativeSongPosition, OneOrRange},
     request_tokenizer::RequestTokenizer,
 };
 
diff --git a/src/commands/queue/moveid.rs b/src/commands/queue/moveid.rs
index 7670432..bc56062 100644
--- a/src/commands/queue/moveid.rs
+++ b/src/commands/queue/moveid.rs
@@ -5,7 +5,7 @@ use crate::{
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    common::{AbsouluteRelativeSongPosition, SongId},
+    common::types::{AbsouluteRelativeSongPosition, SongId},
     request_tokenizer::RequestTokenizer,
 };
 
diff --git a/src/commands/queue/playlistfind.rs b/src/commands/queue/playlistfind.rs
index 5343e5c..0c4ec94 100644
--- a/src/commands/queue/playlistfind.rs
+++ b/src/commands/queue/playlistfind.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{Sort, WindowRange},
+    common::types::{Sort, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
diff --git a/src/commands/queue/playlistid.rs b/src/commands/queue/playlistid.rs
index 3e84d85..d9a1f70 100644
--- a/src/commands/queue/playlistid.rs
+++ b/src/commands/queue/playlistid.rs
@@ -1,7 +1,7 @@
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::SongId,
+    common::types::SongId,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/queue/playlistinfo.rs b/src/commands/queue/playlistinfo.rs
index bfaeb59..c7ffa74 100644
--- a/src/commands/queue/playlistinfo.rs
+++ b/src/commands/queue/playlistinfo.rs
@@ -1,7 +1,7 @@
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::OneOrRange,
+    common::types::OneOrRange,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/queue/playlistsearch.rs b/src/commands/queue/playlistsearch.rs
index ccfb51a..0c4abf3 100644
--- a/src/commands/queue/playlistsearch.rs
+++ b/src/commands/queue/playlistsearch.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{Sort, WindowRange},
+    common::types::{Sort, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
diff --git a/src/commands/queue/plchanges.rs b/src/commands/queue/plchanges.rs
index 5a4c867..67ce9b8 100644
--- a/src/commands/queue/plchanges.rs
+++ b/src/commands/queue/plchanges.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{PlaylistVersion, WindowRange},
+    common::types::{PlaylistVersion, WindowRange},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/queue/plchangesposid.rs b/src/commands/queue/plchangesposid.rs
index 0480e4d..a69f015 100644
--- a/src/commands/queue/plchangesposid.rs
+++ b/src/commands/queue/plchangesposid.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{PlaylistVersion, WindowRange},
+    common::types::{PlaylistVersion, WindowRange},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/queue/prio.rs b/src/commands/queue/prio.rs
index 5f8289e..d90bccd 100644
--- a/src/commands/queue/prio.rs
+++ b/src/commands/queue/prio.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{Priority, WindowRange},
+    common::types::{Priority, WindowRange},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/queue/prioid.rs b/src/commands/queue/prioid.rs
index 51dad9f..e1d218b 100644
--- a/src/commands/queue/prioid.rs
+++ b/src/commands/queue/prioid.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{Priority, SongId},
+    common::types::{Priority, SongId},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/queue/rangeid.rs b/src/commands/queue/rangeid.rs
index 6c5cf51..92faad4 100644
--- a/src/commands/queue/rangeid.rs
+++ b/src/commands/queue/rangeid.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{SongId, TimeInterval},
+    common::types::{SongId, TimeInterval},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/queue/shuffle.rs b/src/commands/queue/shuffle.rs
index 798ddbd..2cd2d38 100644
--- a/src/commands/queue/shuffle.rs
+++ b/src/commands/queue/shuffle.rs
@@ -1,7 +1,7 @@
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::OneOrRange,
+    common::types::OneOrRange,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/queue/swap.rs b/src/commands/queue/swap.rs
index 3086bca..d8e333f 100644
--- a/src/commands/queue/swap.rs
+++ b/src/commands/queue/swap.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::SongPosition,
+    common::types::SongPosition,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/queue/swapid.rs b/src/commands/queue/swapid.rs
index 87ab2d3..d8d0ba9 100644
--- a/src/commands/queue/swapid.rs
+++ b/src/commands/queue/swapid.rs
@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     Request,
     commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
-    common::SongId,
+    common::types::SongId,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/stickers/sticker_dec.rs b/src/commands/stickers/sticker_dec.rs
index c903c26..285ee46 100644
--- a/src/commands/stickers/sticker_dec.rs
+++ b/src/commands/stickers/sticker_dec.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{StickerType, Uri},
+    common::types::{StickerType, Uri},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/stickers/sticker_delete.rs b/src/commands/stickers/sticker_delete.rs
index b9e2113..148fcf3 100644
--- a/src/commands/stickers/sticker_delete.rs
+++ b/src/commands/stickers/sticker_delete.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{StickerType, Uri},
+    common::types::{StickerType, Uri},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/stickers/sticker_find.rs b/src/commands/stickers/sticker_find.rs
index abe1720..12adbbf 100644
--- a/src/commands/stickers/sticker_find.rs
+++ b/src/commands/stickers/sticker_find.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{Sort, StickerType, Uri, WindowRange},
+    common::types::{Sort, StickerType, Uri, WindowRange},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, expect_property_type},
 };
diff --git a/src/commands/stickers/sticker_get.rs b/src/commands/stickers/sticker_get.rs
index 338992b..6fd65b4 100644
--- a/src/commands/stickers/sticker_get.rs
+++ b/src/commands/stickers/sticker_get.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{StickerType, Uri},
+    common::types::{StickerType, Uri},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, get_next_property},
 };
diff --git a/src/commands/stickers/sticker_inc.rs b/src/commands/stickers/sticker_inc.rs
index 4b97343..2ffc54a 100644
--- a/src/commands/stickers/sticker_inc.rs
+++ b/src/commands/stickers/sticker_inc.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{StickerType, Uri},
+    common::types::{StickerType, Uri},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/stickers/sticker_list.rs b/src/commands/stickers/sticker_list.rs
index 188b9f2..e29d157 100644
--- a/src/commands/stickers/sticker_list.rs
+++ b/src/commands/stickers/sticker_list.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{StickerType, Uri},
+    common::types::{StickerType, Uri},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{GenericResponseValue, ResponseAttributes},
 };
diff --git a/src/commands/stickers/sticker_set.rs b/src/commands/stickers/sticker_set.rs
index 34d2b94..697e0e0 100644
--- a/src/commands/stickers/sticker_set.rs
+++ b/src/commands/stickers/sticker_set.rs
@@ -5,7 +5,7 @@ use crate::{
         Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
         ResponseParserError,
     },
-    common::{StickerType, Uri},
+    common::types::{StickerType, Uri},
     request_tokenizer::RequestTokenizer,
 };
 
diff --git a/src/commands/stickers/stickernamestypes.rs b/src/commands/stickers/stickernamestypes.rs
index 9b82a73..afd4676 100644
--- a/src/commands/stickers/stickernamestypes.rs
+++ b/src/commands/stickers/stickernamestypes.rs
@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use crate::{
     commands::{Command, Request, RequestParserResult, ResponseParserError},
-    common::StickerType,
+    common::types::StickerType,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, expect_property_type},
 };
diff --git a/src/commands/stored_playlists/listplaylist.rs b/src/commands/stored_playlists/listplaylist.rs
index c44059b..a5b93cf 100644
--- a/src/commands/stored_playlists/listplaylist.rs
+++ b/src/commands/stored_playlists/listplaylist.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{PlaylistName, WindowRange},
+    common::types::{PlaylistName, WindowRange},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, expect_property_type},
 };
diff --git a/src/commands/stored_playlists/listplaylistinfo.rs b/src/commands/stored_playlists/listplaylistinfo.rs
index b1c6a28..0c5ae73 100644
--- a/src/commands/stored_playlists/listplaylistinfo.rs
+++ b/src/commands/stored_playlists/listplaylistinfo.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{PlaylistName, WindowRange},
+    common::types::{PlaylistName, WindowRange},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/stored_playlists/load.rs b/src/commands/stored_playlists/load.rs
index f3799e6..934147e 100644
--- a/src/commands/stored_playlists/load.rs
+++ b/src/commands/stored_playlists/load.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{PlaylistName, SongPosition, WindowRange},
+    common::types::{PlaylistName, SongPosition, WindowRange},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/stored_playlists/playlistadd.rs b/src/commands/stored_playlists/playlistadd.rs
index a62cd3a..a5c240f 100644
--- a/src/commands/stored_playlists/playlistadd.rs
+++ b/src/commands/stored_playlists/playlistadd.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{PlaylistName, SongPosition, Uri},
+    common::types::{PlaylistName, SongPosition, Uri},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/stored_playlists/playlistclear.rs b/src/commands/stored_playlists/playlistclear.rs
index 9f1e746..3df8027 100644
--- a/src/commands/stored_playlists/playlistclear.rs
+++ b/src/commands/stored_playlists/playlistclear.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::PlaylistName,
+    common::types::PlaylistName,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/stored_playlists/playlistdelete.rs b/src/commands/stored_playlists/playlistdelete.rs
index 7c48ad5..549bdfd 100644
--- a/src/commands/stored_playlists/playlistdelete.rs
+++ b/src/commands/stored_playlists/playlistdelete.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{OneOrRange, PlaylistName},
+    common::types::{OneOrRange, PlaylistName},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/stored_playlists/playlistlength.rs b/src/commands/stored_playlists/playlistlength.rs
index 8fcbe73..8414741 100644
--- a/src/commands/stored_playlists/playlistlength.rs
+++ b/src/commands/stored_playlists/playlistlength.rs
@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::PlaylistName,
+    common::types::PlaylistName,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, get_and_parse_property},
 };
diff --git a/src/commands/stored_playlists/playlistmove.rs b/src/commands/stored_playlists/playlistmove.rs
index 044f90d..690be20 100644
--- a/src/commands/stored_playlists/playlistmove.rs
+++ b/src/commands/stored_playlists/playlistmove.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{OneOrRange, PlaylistName, SongPosition},
+    common::types::{OneOrRange, PlaylistName, SongPosition},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/stored_playlists/rm.rs b/src/commands/stored_playlists/rm.rs
index 32aa491..1cb2d2b 100644
--- a/src/commands/stored_playlists/rm.rs
+++ b/src/commands/stored_playlists/rm.rs
@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::PlaylistName,
+    common::types::PlaylistName,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/stored_playlists/save.rs b/src/commands/stored_playlists/save.rs
index 7bf69a7..a5b334e 100644
--- a/src/commands/stored_playlists/save.rs
+++ b/src/commands/stored_playlists/save.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{PlaylistName, SaveMode},
+    common::types::{PlaylistName, SaveMode},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
 };
diff --git a/src/commands/stored_playlists/searchplaylist.rs b/src/commands/stored_playlists/searchplaylist.rs
index 4eb3f66..e0862be 100644
--- a/src/commands/stored_playlists/searchplaylist.rs
+++ b/src/commands/stored_playlists/searchplaylist.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
-    common::{PlaylistName, WindowRange},
+    common::types::{PlaylistName, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
diff --git a/src/common.rs b/src/common.rs
index fe642b3..0d87a63 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -1,2 +1 @@
-mod types;
-pub use types::*;
+pub(crate) mod types;
diff --git a/src/filter/filter.rs b/src/filter/filter.rs
index 9598829..6169a92 100644
--- a/src/filter/filter.rs
+++ b/src/filter/filter.rs
@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::RequestParserError,
-    common::{Priority, Tag},
+    common::types::{Priority, Tag},
 };
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
diff --git a/src/filter/filter_grammar.lalrpop b/src/filter/filter_grammar.lalrpop
index 48616da..156c87a 100644
--- a/src/filter/filter_grammar.lalrpop
+++ b/src/filter/filter_grammar.lalrpop
@@ -1,7 +1,7 @@
 use std::str::FromStr;
 use chrono::{DateTime, Utc};
 use crate::filter::filter::{CaseSensitivity, ComparisonOperator, Filter, unescape_string};
-use crate::common::Tag;
+use crate::common::types::Tag;
 
 grammar;
 
diff --git a/src/request.rs b/src/request.rs
index 8b1d794..47a9e90 100644
--- a/src/request.rs
+++ b/src/request.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use crate::common::*;
+use crate::common::types::*;
 use crate::request_tokenizer::RequestTokenizer;
 
 use crate::commands::*;
diff --git a/src/server.rs b/src/server.rs
index ea5b822..6c5e62d 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -1,4 +1,4 @@
-use crate::{Request, Response, common::SubSystem};
+use crate::{Request, Response, common::types::SubSystem};
 
 pub trait MPDServer {
     type Error;