diff --git a/lib/pleroma/web/preload/instance.ex b/lib/pleroma/web/preload/providers/instance.ex
similarity index 100%
rename from lib/pleroma/web/preload/instance.ex
rename to lib/pleroma/web/preload/providers/instance.ex
diff --git a/lib/pleroma/web/preload/provider.ex b/lib/pleroma/web/preload/providers/provider.ex
similarity index 100%
rename from lib/pleroma/web/preload/provider.ex
rename to lib/pleroma/web/preload/providers/provider.ex
diff --git a/lib/pleroma/web/preload/timelines.ex b/lib/pleroma/web/preload/providers/timelines.ex
similarity index 100%
rename from lib/pleroma/web/preload/timelines.ex
rename to lib/pleroma/web/preload/providers/timelines.ex
diff --git a/lib/pleroma/web/preload/user.ex b/lib/pleroma/web/preload/providers/user.ex
similarity index 100%
rename from lib/pleroma/web/preload/user.ex
rename to lib/pleroma/web/preload/providers/user.ex
diff --git a/test/http/ex_aws_test.exs b/test/pleroma/http/ex_aws_test.exs
similarity index 100%
rename from test/http/ex_aws_test.exs
rename to test/pleroma/http/ex_aws_test.exs
diff --git a/test/web/preload/instance_test.exs b/test/pleroma/web/preload/providers/instance_test.exs
similarity index 100%
rename from test/web/preload/instance_test.exs
rename to test/pleroma/web/preload/providers/instance_test.exs
diff --git a/test/web/preload/timeline_test.exs b/test/pleroma/web/preload/providers/timeline_test.exs
similarity index 100%
rename from test/web/preload/timeline_test.exs
rename to test/pleroma/web/preload/providers/timeline_test.exs
diff --git a/test/web/preload/user_test.exs b/test/pleroma/web/preload/providers/user_test.exs
similarity index 100%
rename from test/web/preload/user_test.exs
rename to test/pleroma/web/preload/providers/user_test.exs