diff --git a/app/util/dkim_header.rb b/app/lib/dkim_header.rb
similarity index 100%
rename from app/util/dkim_header.rb
rename to app/lib/dkim_header.rb
diff --git a/app/util/dns_resolver.rb b/app/lib/dns_resolver.rb
similarity index 100%
rename from app/util/dns_resolver.rb
rename to app/lib/dns_resolver.rb
diff --git a/app/util/message_dequeuer.rb b/app/lib/message_dequeuer.rb
similarity index 100%
rename from app/util/message_dequeuer.rb
rename to app/lib/message_dequeuer.rb
diff --git a/app/util/query_string.rb b/app/lib/query_string.rb
similarity index 100%
rename from app/util/query_string.rb
rename to app/lib/query_string.rb
diff --git a/spec/util/dkim_header_spec.rb b/spec/lib/dkim_header_spec.rb
similarity index 100%
rename from spec/util/dkim_header_spec.rb
rename to spec/lib/dkim_header_spec.rb
diff --git a/spec/util/dns_resolver_spec.rb b/spec/lib/dns_resolver_spec.rb
similarity index 100%
rename from spec/util/dns_resolver_spec.rb
rename to spec/lib/dns_resolver_spec.rb
diff --git a/spec/util/message_dequeuer_spec.rb b/spec/lib/message_dequeuer_spec.rb
similarity index 100%
rename from spec/util/message_dequeuer_spec.rb
rename to spec/lib/message_dequeuer_spec.rb
diff --git a/spec/util/query_string_spec.rb b/spec/lib/query_string_spec.rb
similarity index 100%
rename from spec/util/query_string_spec.rb
rename to spec/lib/query_string_spec.rb