diff --git a/src/FACT_data_API_reader.jl b/src/FACT_data_API_reader.jl
index f324bff8e01d76be9ec81b48a71192adcdbf4b20..937970c67d933b1a4af188238998afcd0be2a32e 100644
--- a/src/FACT_data_API_reader.jl
+++ b/src/FACT_data_API_reader.jl
@@ -31,29 +31,29 @@ module FACT_data_API_reader
     include("utils/web_service.jl")
     include("utils/containers_configuration.jl")
     export get_data_container_config
-    include("FACT_geo.jl")
+    include("data_services/FACT_geo.jl")
     export get_geo_objects
-    include("FACT_road.jl")
+    include("data_services/FACT_road.jl")
     export get_travel_data_eu, get_travel_data_na
-    include("FACT_jobs.jl")
+    include("data_services/FACT_jobs.jl")
     export get_annual_jobs
-    include("FACT_population.jl")
+    include("data_services/FACT_population.jl")
     export get_annual_population
-    include("FACT_air.jl")
+    include("data_services/FACT_air.jl")
     export get_airports_traffic
-    include("FACT_elevation.jl")
+    include("data_services/FACT_elevation.jl")
     export get_elevation_data
-    include("FACT_rail.jl")
+    include("data_services/FACT_rail.jl")
     export get_rail_stations_lines
-    include("FACT_ports.jl")
+    include("data_services/FACT_ports.jl")
     export get_ports_tonnage
-    include("FACT_power.jl")
+    include("data_services/FACT_power.jl")
     export get_power_stations_lines
-    include("FACT_lulc.jl")
+    include("data_services/FACT_lulc.jl")
     export get_land_use_data
-    include("FACT_mine.jl")
+    include("data_services/FACT_mine.jl")
     export get_geology, get_minerals
-    include("FACT_bldgs.jl")
+    include("data_services/FACT_bldgs.jl")
     export get_bldgs_footprint_height
 
 
diff --git a/src/FACT_air.jl b/src/data_services/FACT_air.jl
similarity index 100%
rename from src/FACT_air.jl
rename to src/data_services/FACT_air.jl
diff --git a/src/FACT_bldgs.jl b/src/data_services/FACT_bldgs.jl
similarity index 100%
rename from src/FACT_bldgs.jl
rename to src/data_services/FACT_bldgs.jl
diff --git a/src/FACT_elevation.jl b/src/data_services/FACT_elevation.jl
similarity index 100%
rename from src/FACT_elevation.jl
rename to src/data_services/FACT_elevation.jl
diff --git a/src/FACT_geo.jl b/src/data_services/FACT_geo.jl
similarity index 100%
rename from src/FACT_geo.jl
rename to src/data_services/FACT_geo.jl
diff --git a/src/FACT_jobs.jl b/src/data_services/FACT_jobs.jl
similarity index 100%
rename from src/FACT_jobs.jl
rename to src/data_services/FACT_jobs.jl
diff --git a/src/FACT_lulc.jl b/src/data_services/FACT_lulc.jl
similarity index 100%
rename from src/FACT_lulc.jl
rename to src/data_services/FACT_lulc.jl
diff --git a/src/FACT_mine.jl b/src/data_services/FACT_mine.jl
similarity index 100%
rename from src/FACT_mine.jl
rename to src/data_services/FACT_mine.jl
diff --git a/src/FACT_population.jl b/src/data_services/FACT_population.jl
similarity index 100%
rename from src/FACT_population.jl
rename to src/data_services/FACT_population.jl
diff --git a/src/FACT_ports.jl b/src/data_services/FACT_ports.jl
similarity index 100%
rename from src/FACT_ports.jl
rename to src/data_services/FACT_ports.jl
diff --git a/src/FACT_power.jl b/src/data_services/FACT_power.jl
similarity index 100%
rename from src/FACT_power.jl
rename to src/data_services/FACT_power.jl
diff --git a/src/FACT_rail.jl b/src/data_services/FACT_rail.jl
similarity index 100%
rename from src/FACT_rail.jl
rename to src/data_services/FACT_rail.jl
diff --git a/src/FACT_road.jl b/src/data_services/FACT_road.jl
similarity index 100%
rename from src/FACT_road.jl
rename to src/data_services/FACT_road.jl
diff --git a/test/nm_test/FACT_air.jl b/test/nm_test/FACT_air.jl
index e483ef5a5894a4b519b7bf5f794ccca4077b9028..0326500b16e8db17e092a413750ee27f18d3370e 100644
--- a/test/nm_test/FACT_air.jl
+++ b/test/nm_test/FACT_air.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_air test" begin
+@testset "FACT_data_API_reader FACT_air test" begin
     df1 = get_geo_objects("nm_counties")
     selection_dict = Dict(
         "geo_id" => df1[!, :geo_id],
diff --git a/test/nm_test/FACT_bldgs.jl b/test/nm_test/FACT_bldgs.jl
index f05d0929dc27ede206afd4a2a58bd6bb49c7afe5..e07c4eccfa79186c2b9d571f510befc5dd10c3df 100644
--- a/test/nm_test/FACT_bldgs.jl
+++ b/test/nm_test/FACT_bldgs.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_bldgs test" begin
+@testset "FACT_data_API_reader FACT_bldgs test" begin
     df1 = get_geo_objects("nm_counties")
     resize!(df1, 3)
     selection_dict = Dict(
diff --git a/test/nm_test/FACT_elevation.jl b/test/nm_test/FACT_elevation.jl
index 9bd00cce8b708fa7bf6c08fb83dff15f30a16b45..9a0adf92f549cf95d51f2d240e3df7fdbd041bfd 100644
--- a/test/nm_test/FACT_elevation.jl
+++ b/test/nm_test/FACT_elevation.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_elevation test" begin
+@testset "FACT_data_API_reader FACT_elevation test" begin
     df1 = get_geo_objects("nm_counties")
     resize!(df1, 1)
     selection_dict = Dict(
diff --git a/test/nm_test/FACT_geo.jl b/test/nm_test/FACT_geo.jl
index 8261c9a8dbec74df2b8833d3adbbe23f1cef226a..15d99b33f35c9d00930fba391e97535e0317b820 100644
--- a/test/nm_test/FACT_geo.jl
+++ b/test/nm_test/FACT_geo.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_geo test" begin
+@testset "FACT_data_API_reader FACT_geo test" begin
     df = get_geo_objects("nm_counties")
     # Test if the result is a DataFrame
     @test df isa DataFrame
diff --git a/test/nm_test/FACT_jobs.jl b/test/nm_test/FACT_jobs.jl
index 7590fa3583371b8116cbe8d49c51712ce4dac159..305a0dc7bd2afb2352837589c77abf4d2428cc08 100644
--- a/test/nm_test/FACT_jobs.jl
+++ b/test/nm_test/FACT_jobs.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_jobs test" begin
+@testset "FACT_data_API_reader FACT_jobs test" begin
     df1 = get_geo_objects("nm_counties")
     resize!(df1, 3)
     year = 2018
diff --git a/test/nm_test/FACT_lulc.jl b/test/nm_test/FACT_lulc.jl
index 145c97d5ec984a143ff82d211b8fda4d30e9fe85..2c71a3ee4db964585855ddfb42f286e5fab2b58d 100644
--- a/test/nm_test/FACT_lulc.jl
+++ b/test/nm_test/FACT_lulc.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_lulc test" begin
+@testset "FACT_data_API_reader FACT_lulc test" begin
     df1 = get_geo_objects("nm_counties")
     resize!(df1, 3)
     selection_dict = Dict(
diff --git a/test/nm_test/FACT_mine.jl b/test/nm_test/FACT_mine.jl
index 6ff962b514577c3152a81198f071ff7b39368830..0e3e0133a90b03743656cb7aa771b9b116f27688 100644
--- a/test/nm_test/FACT_mine.jl
+++ b/test/nm_test/FACT_mine.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_mine test" begin
+@testset "FACT_data_API_reader FACT_mine test" begin
     df1 = get_geo_objects("nm_counties")
     resize!(df1, 3)
     selection_dict = Dict(
diff --git a/test/nm_test/FACT_population.jl b/test/nm_test/FACT_population.jl
index 1c9839e908622f006cf1f63ddb3da1d33406ee38..f1fc739c464b22f0c0cdfaf8a5a1d80adfbb34bc 100644
--- a/test/nm_test/FACT_population.jl
+++ b/test/nm_test/FACT_population.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_population test" begin
+@testset "FACT_data_API_reader FACT_population test" begin
     df1 = get_geo_objects("nm_blocks")
     resize!(df1, 5)
     year = 2020
diff --git a/test/nm_test/FACT_ports.jl b/test/nm_test/FACT_ports.jl
index 99651de2579a710bacc2bd869b91dea6f126eafd..f074ffd983bd622fb5edafe239cd8230b6d2d9e4 100644
--- a/test/nm_test/FACT_ports.jl
+++ b/test/nm_test/FACT_ports.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_ports test" begin
+@testset "FACT_data_API_reader FACT_ports test" begin
     df1 = get_geo_objects("nm_counties")
     resize!(df1, 3)
     selection_dict = Dict(
diff --git a/test/nm_test/FACT_power.jl b/test/nm_test/FACT_power.jl
index 5ed2fe8dccf9d30ae463b198e55723ba86cd04e2..0f91f4f3d89f693f10c5a0b4d7d44b29e0d323ec 100644
--- a/test/nm_test/FACT_power.jl
+++ b/test/nm_test/FACT_power.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_power test" begin
+@testset "FACT_data_API_reader FACT_power test" begin
     df1 = get_geo_objects("nm_counties")
     resize!(df1, 3)
     selection_dict = Dict(
diff --git a/test/nm_test/FACT_rail.jl b/test/nm_test/FACT_rail.jl
index 333cfe00c089d4543f00aa126f84db50bd4e6b09..c5c6675c1d120e83a00fba0b86646bffc32e7cbf 100644
--- a/test/nm_test/FACT_rail.jl
+++ b/test/nm_test/FACT_rail.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_rail test" begin
+@testset "FACT_data_API_reader FACT_rail test" begin
     df1 = get_geo_objects("nm_counties")
     resize!(df1, 3)
     selection_dict = Dict(
diff --git a/test/nm_test/FACT_road_NA.jl b/test/nm_test/FACT_road_NA.jl
index f6b7774c2a746574c2a671c1cfe7347fd5671b91..0348a77b0caa54654167df0ae210fd15dfb90b44 100644
--- a/test/nm_test/FACT_road_NA.jl
+++ b/test/nm_test/FACT_road_NA.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_road_NA test" begin
+@testset "FACT_data_API_reader FACT_road_NA test" begin
     df1 = get_geo_objects("nm_counties")
     resize!(df1, 3)
     selection_dict = Dict(
diff --git a/test/no_test/FACT_air.jl b/test/no_test/FACT_air.jl
index 1c466b0c82b62997ed64578898f68a5d6b878854..9ed22dd56fbdfef8ec669c4c417e7b9cd074ad3a 100644
--- a/test/no_test/FACT_air.jl
+++ b/test/no_test/FACT_air.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_air test" begin
+@testset "FACT_data_API_reader FACT_air test" begin
     df1 = get_geo_objects("no_counties")
     selection_dict = Dict(
         "geo_id" => df1[!, :geo_id],
diff --git a/test/no_test/FACT_bldgs.jl b/test/no_test/FACT_bldgs.jl
index 7dfd8b2e17c317db512683a5951e14f9ccf0dc90..d7d55f5d99c2300f9d54b6adb6d8212a4c9359cc 100644
--- a/test/no_test/FACT_bldgs.jl
+++ b/test/no_test/FACT_bldgs.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_bldgs test" begin
+@testset "FACT_data_API_reader FACT_bldgs test" begin
     df1 = get_geo_objects("no_counties")
     resize!(df1, 3)
     selection_dict = Dict(
diff --git a/test/no_test/FACT_elevation.jl b/test/no_test/FACT_elevation.jl
index 6b84ef5953a73efa37c3c09011622180f7ed3163..dd1966145353fb0a23033afa3ac152705b49e96e 100644
--- a/test/no_test/FACT_elevation.jl
+++ b/test/no_test/FACT_elevation.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_elevation test" begin
+@testset "FACT_data_API_reader FACT_elevation test" begin
     df1 = get_geo_objects("no_counties")
     resize!(df1, 1)
     selection_dict = Dict(
diff --git a/test/no_test/FACT_geo.jl b/test/no_test/FACT_geo.jl
index 5632d809f40b33a50a4ebff77ce3fa6cbca8e39f..22b2184ad1130aa15b62bdaeaba20652b7a5b8f8 100644
--- a/test/no_test/FACT_geo.jl
+++ b/test/no_test/FACT_geo.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_geo test" begin
+@testset "FACT_data_API_reader FACT_geo test" begin
     df = get_geo_objects("no_counties")
     # Test if the result is a DataFrame
     @test df isa DataFrame
diff --git a/test/no_test/FACT_jobs.jl b/test/no_test/FACT_jobs.jl
index 968d8d4097418d1a9c5783b2387e268800c614cc..4921aa65ba16dc34c00934478682e1c04e7d50fb 100644
--- a/test/no_test/FACT_jobs.jl
+++ b/test/no_test/FACT_jobs.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_jobs test" begin
+@testset "FACT_data_API_reader FACT_jobs test" begin
     df1 = get_geo_objects("no_counties")
     resize!(df1, 3)
     year = 2018
diff --git a/test/no_test/FACT_lulc.jl b/test/no_test/FACT_lulc.jl
index 58c4dcd029d01175812226d7a7ad80b3d6039b44..54999daa7d9e963bdbcf38e7d46b3a0e480b83c3 100644
--- a/test/no_test/FACT_lulc.jl
+++ b/test/no_test/FACT_lulc.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_lulc test" begin
+@testset "FACT_data_API_reader FACT_lulc test" begin
     df1 = get_geo_objects("no_counties")
     resize!(df1, 3)
     selection_dict = Dict(
diff --git a/test/no_test/FACT_mine.jl b/test/no_test/FACT_mine.jl
index a7e84402ddcb7b23c5098a9c22ef96cd2a69f352..c3460b6ce4bdea047cfd04679cbe0896ec064dec 100644
--- a/test/no_test/FACT_mine.jl
+++ b/test/no_test/FACT_mine.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_mine test" begin
+@testset "FACT_data_API_reader FACT_mine test" begin
     df1 = get_geo_objects("no_counties")
     resize!(df1, 3)
     selection_dict = Dict(
diff --git a/test/no_test/FACT_population.jl b/test/no_test/FACT_population.jl
index ff9a93edbd616b97de4ea2e4ab807f4548c39d84..07bdb6e300f9015d6a0a1069b00ad7b5f847ce9d 100644
--- a/test/no_test/FACT_population.jl
+++ b/test/no_test/FACT_population.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_population test" begin
+@testset "FACT_data_API_reader FACT_population test" begin
     df1 = get_geo_objects("no_lau")
     year = 2011
     selection_dict = Dict(
diff --git a/test/no_test/FACT_ports.jl b/test/no_test/FACT_ports.jl
index 7381bd0b706acb9e01701ed4f1df9ee273d241c0..839a67cf51453338953497e7e65130a331850b52 100644
--- a/test/no_test/FACT_ports.jl
+++ b/test/no_test/FACT_ports.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_ports test" begin
+@testset "FACT_data_API_reader FACT_ports test" begin
     df1 = get_geo_objects("no_counties")
     resize!(df1, 3)
     selection_dict = Dict(
diff --git a/test/no_test/FACT_power.jl b/test/no_test/FACT_power.jl
index 6f40a9704a5b80ea0b7fac9a87ba9d47a21e8fb3..78938a81e5e1db2163377172dae700f1f8982190 100644
--- a/test/no_test/FACT_power.jl
+++ b/test/no_test/FACT_power.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_power test" begin
+@testset "FACT_data_API_reader FACT_power test" begin
     df1 = get_geo_objects("no_counties")
     resize!(df1, 3)
     selection_dict = Dict(
diff --git a/test/no_test/FACT_rail.jl b/test/no_test/FACT_rail.jl
index ec64782c7ccf3b00852771b9858578260a458e3c..0d59918e1fb9c9cce2cdf4767bd186e535b27066 100644
--- a/test/no_test/FACT_rail.jl
+++ b/test/no_test/FACT_rail.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_rail test" begin
+@testset "FACT_data_API_reader FACT_rail test" begin
     df1 = get_geo_objects("no_counties")
     selection_dict = Dict(
         "geo_id" => df1[!, :geo_id],
diff --git a/test/no_test/FACT_road_EU.jl b/test/no_test/FACT_road_EU.jl
index 49f86eaff3f70c9053f3f1792d6a3e56c0d7246e..f2ce0aaf40b783a6bd5056ed3f64238376e0f982 100644
--- a/test/no_test/FACT_road_EU.jl
+++ b/test/no_test/FACT_road_EU.jl
@@ -1,4 +1,4 @@
-@testset "FACTDataREader FACT_road_EU test" begin
+@testset "FACT_data_API_reader FACT_road_EU test" begin
     df1 = get_geo_objects("no_counties")
     resize!(df1, 3)
     selection_dict = Dict(
diff --git a/test/runtests.jl b/test/runtests.jl
index 9792602b19ad3b320288a87a86b7e8e83c5d5a3f..7fa2cfe9d00d3512e38fd320686c11c0dd039ebb 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,8 +1,8 @@
 using Test
 using DataFrames
-using FACTDataReader
+using FACT_data_API_reader
 
-@testset "FACTDataREader New Mexico Tests" begin
+@testset "FACT_data_API_reader New Mexico Tests" begin
     include("nm_test/FACT_geo.jl")
     include("nm_test/FACT_jobs.jl")
     include("nm_test/FACT_population.jl")
@@ -17,7 +17,7 @@ using FACTDataReader
     include("nm_test/FACT_bldgs.jl")
 end
 
-@testset "FACTDataREader Norway Tests" begin
+@testset "FACT_data_API_reader Norway Tests" begin
     include("no_test/FACT_geo.jl")
     include("no_test/FACT_jobs.jl")
     include("no_test/FACT_population.jl")