diff --git a/components/mainComponent/MapComponent.js b/components/mainComponent/MapComponent.js
index f295931a0..bb5ef907f 100644
--- a/components/mainComponent/MapComponent.js
+++ b/components/mainComponent/MapComponent.js
@@ -63,11 +63,11 @@ import { fetchGisStationsStaticDistrictThunk } from "../../redux/thunks/webservi
 import { fetchGisStationsStatusDistrictThunk } from "../../redux/thunks/webservice/fetchGisStationsStatusDistrictThunk";
 import { fetchLocationDevicesThunk } from "../../redux/thunks/database/fetchLocationDevicesThunk";
 import { fetchPriorityConfigThunk } from "../../redux/thunks/database/fetchPriorityConfigThunk";
-import { fetchGisLinesThunk } from "../../redux/thunks/database/fetchGisLinesThunk";
+import { fetchGisLinesThunk } from "../../redux/thunks/database/polylines/fetchGisLinesThunk.js";
 import { fetchGisLinesStatusThunk } from "../../redux/thunks/webservice/fetchGisLinesStatusThunk";
 import { fetchUserRightsThunk } from "../../redux/thunks/webservice/fetchUserRightsThunk";
-import { fetchPoiIconsDataThunk } from "../../redux/thunks/database/fetchPoiIconsDataThunk";
-import { fetchPoiTypThunk } from "../../redux/thunks/database/fetchPoiTypThunk";
+import { fetchPoiIconsDataThunk } from "../../redux/thunks/database/pois/fetchPoiIconsDataThunk.js";
+import { fetchPoiTypThunk } from "../../redux/thunks/database/pois/fetchPoiTypThunk.js";
 
 //-----------------------------------------------------------------------------------------------------
 const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
diff --git a/components/pois/AddPOIModal.js b/components/pois/AddPOIModal.js
index f0f3456a0..66cbf01bb 100644
--- a/components/pois/AddPOIModal.js
+++ b/components/pois/AddPOIModal.js
@@ -4,8 +4,8 @@ import { useDispatch, useSelector } from "react-redux";
 import { selectGisStationsStaticDistrict } from "../../redux/slices/webservice/gisStationsStaticDistrictSlice";
 import { fetchPoiTypes } from "../../redux/slices/database/poiTypesSlice";
 import { incrementTrigger } from "../../redux/slices/poiReadFromDbTriggerSlice";
-import { addPoiThunk } from "../../redux/thunks/database/addPoiThunk";
-import { fetchPoiIconsDataThunk } from "../../redux/thunks/database/fetchPoiIconsDataThunk";
+import { addPoiThunk } from "../../redux/thunks/database/pois/addPoiThunk";
+import { fetchPoiIconsDataThunk } from "../../redux/thunks/database/pois/fetchPoiIconsDataThunk";
 
 const AddPOIModal = ({ onClose, map, latlng }) => {
   const dispatch = useDispatch();
diff --git a/components/pois/PoiUpdateModal.js b/components/pois/PoiUpdateModal.js
index ab086b39b..0ee50d805 100644
--- a/components/pois/PoiUpdateModal.js
+++ b/components/pois/PoiUpdateModal.js
@@ -3,11 +3,11 @@ import React, { useState, useEffect } from "react";
 import Select from "react-select";
 import { useSelector, useDispatch } from "react-redux";
 import { fetchLocationDevicesThunk } from "../../redux/thunks/database/fetchLocationDevicesThunk";
-import { fetchPoiTypThunk } from "../../redux/thunks/database/fetchPoiTypThunk";
+import { fetchPoiTypThunk } from "../../redux/thunks/database/pois/fetchPoiTypThunk";
 import { selectMapLayersState } from "../../redux/slices/mapLayersSlice";
 import { selectPoiTypData, selectPoiTypStatus } from "../../redux/slices/database/poiTypSlice";
-import { deletePoiThunk } from "../../redux/thunks/database/deletePoiThunk";
-import { updatePoiThunk } from "../../redux/thunks/database/updatePoiThunk";
+import { deletePoiThunk } from "../../redux/thunks/database/pois/deletePoiThunk";
+import { updatePoiThunk } from "../../redux/thunks/database/pois/updatePoiThunk";
 
 const PoiUpdateModal = ({ onClose, poiData }) => {
   const dispatch = useDispatch();
diff --git a/config/appVersion.js b/config/appVersion.js
index 55ffcd6d8..20ca14064 100644
--- a/config/appVersion.js
+++ b/config/appVersion.js
@@ -1,2 +1,2 @@
 // /config/appVersion
-export const APP_VERSION = "1.1.168";
+export const APP_VERSION = "1.1.169";
diff --git a/hooks/useLineData.js b/hooks/useLineData.js
index 16bebe12a..d1c7534e2 100644
--- a/hooks/useLineData.js
+++ b/hooks/useLineData.js
@@ -2,7 +2,7 @@
 import { useEffect, useState } from "react";
 import { useSelector, useDispatch } from "react-redux";
 import { selectGisLinesStatusFromWebservice } from "../redux/slices/webservice/gisLinesStatusSlice";
-import { fetchGisLinesThunk } from "../redux/thunks/database/fetchGisLinesThunk";
+import { fetchGisLinesThunk } from "../redux/thunks/database/polylines/fetchGisLinesThunk";
 import { fetchGisLinesStatusThunk } from "../redux/thunks/webservice/fetchGisLinesStatusThunk";
 
 const useLineData = () => {
diff --git a/redux/slices/database/addPoiSlice.js b/redux/slices/database/addPoiSlice.js
index 71bf3fea9..77e188bd6 100644
--- a/redux/slices/database/addPoiSlice.js
+++ b/redux/slices/database/addPoiSlice.js
@@ -1,5 +1,5 @@
 import { createSlice } from "@reduxjs/toolkit";
-import { addPoiThunk } from "../../thunks/database/addPoiThunk";
+import { addPoiThunk } from "../../thunks/database/pois/addPoiThunk";
 
 const initialState = {
   status: "idle", // idle | loading | succeeded | failed
diff --git a/redux/slices/database/gisLinesSlice.js b/redux/slices/database/gisLinesSlice.js
index ac48b1e00..1852fab9c 100644
--- a/redux/slices/database/gisLinesSlice.js
+++ b/redux/slices/database/gisLinesSlice.js
@@ -1,6 +1,6 @@
 // /redux/slices/database/gisLinesSlice.js
 import { createSlice } from "@reduxjs/toolkit";
-import { fetchGisLinesThunk } from "../../thunks/database/fetchGisLinesThunk";
+import { fetchGisLinesThunk } from "../../thunks/database/polylines/fetchGisLinesThunk";
 
 const gisLinesSlice = createSlice({
   name: "gisLinesFromDatabase",
diff --git a/redux/slices/database/poiIconsDataSlice.js b/redux/slices/database/poiIconsDataSlice.js
index e1c3e842f..8b8f28d85 100644
--- a/redux/slices/database/poiIconsDataSlice.js
+++ b/redux/slices/database/poiIconsDataSlice.js
@@ -1,6 +1,6 @@
 // /redux/slices/database/poiIconsDataSlice.js
 import { createSlice } from "@reduxjs/toolkit";
-import { fetchPoiIconsDataThunk } from "../../thunks/database/fetchPoiIconsDataThunk";
+import { fetchPoiIconsDataThunk } from "../../thunks/database/pois/fetchPoiIconsDataThunk";
 
 const initialState = {
   data: [],
diff --git a/redux/slices/database/poiTypSlice.js b/redux/slices/database/poiTypSlice.js
index f815434c8..d02b7b716 100644
--- a/redux/slices/database/poiTypSlice.js
+++ b/redux/slices/database/poiTypSlice.js
@@ -1,6 +1,6 @@
 // /redux/slices/database/poiTypSlice.js
 import { createSlice } from "@reduxjs/toolkit";
-import { fetchPoiTypThunk } from "../../thunks/database/fetchPoiTypThunk";
+import { fetchPoiTypThunk } from "../../thunks/database/pois/fetchPoiTypThunk";
 
 const initialState = {
   data: [],
diff --git a/redux/thunks/database/addPoiThunk.js b/redux/thunks/database/pois/addPoiThunk.js
similarity index 67%
rename from redux/thunks/database/addPoiThunk.js
rename to redux/thunks/database/pois/addPoiThunk.js
index 1bce8adbd..1033b9e84 100644
--- a/redux/thunks/database/addPoiThunk.js
+++ b/redux/thunks/database/pois/addPoiThunk.js
@@ -1,6 +1,6 @@
-// /redux/thunks/database/addPoiThunk.js
+// /redux/thunks/database/pois/addPoiThunk.js
 import { createAsyncThunk } from "@reduxjs/toolkit";
-import { addPoiService } from "../../../services/database/pois/addPoiService";
+import { addPoiService } from "../../../../services/database/pois/addPoiService";
 
 export const addPoiThunk = createAsyncThunk("poi/add", async (formData, thunkAPI) => {
   try {
diff --git a/redux/thunks/database/deletePoiThunk.js b/redux/thunks/database/pois/deletePoiThunk.js
similarity index 81%
rename from redux/thunks/database/deletePoiThunk.js
rename to redux/thunks/database/pois/deletePoiThunk.js
index 0433ebbb3..a83ddee39 100644
--- a/redux/thunks/database/deletePoiThunk.js
+++ b/redux/thunks/database/pois/deletePoiThunk.js
@@ -1,7 +1,7 @@
 // /redux/thunks/database/deletePoiThunk.js
 
 import { createAsyncThunk } from "@reduxjs/toolkit";
-import { deletePoiService } from "../../../services/database/pois/deletePoiService";
+import { deletePoiService } from "../../../../services/database/pois/deletePoiService";
 
 export const deletePoiThunk = createAsyncThunk("poi/delete", async (id, thunkAPI) => {
   try {
diff --git a/redux/thunks/database/fetchPoiIconsDataThunk.js b/redux/thunks/database/pois/fetchPoiIconsDataThunk.js
similarity index 76%
rename from redux/thunks/database/fetchPoiIconsDataThunk.js
rename to redux/thunks/database/pois/fetchPoiIconsDataThunk.js
index 19ca7e2ca..94eca8c5d 100644
--- a/redux/thunks/database/fetchPoiIconsDataThunk.js
+++ b/redux/thunks/database/pois/fetchPoiIconsDataThunk.js
@@ -1,6 +1,6 @@
 // /redux/thunks/database/fetchPoiIconsDataThunk.js
 import { createAsyncThunk } from "@reduxjs/toolkit";
-import { fetchPoiIconsDataService } from "../../../services/database/pois/fetchPoiIconsDataService";
+import { fetchPoiIconsDataService } from "../../../../services/database/pois/fetchPoiIconsDataService";
 
 export const fetchPoiIconsDataThunk = createAsyncThunk("poiIconsData/fetch", async (_, thunkAPI) => {
   try {
diff --git a/redux/thunks/database/fetchPoiTypThunk.js b/redux/thunks/database/pois/fetchPoiTypThunk.js
similarity index 77%
rename from redux/thunks/database/fetchPoiTypThunk.js
rename to redux/thunks/database/pois/fetchPoiTypThunk.js
index 44b12aee8..bc78981f4 100644
--- a/redux/thunks/database/fetchPoiTypThunk.js
+++ b/redux/thunks/database/pois/fetchPoiTypThunk.js
@@ -1,6 +1,6 @@
 // /redux/thunks/database/fetchPoiTypThunk.js
 import { createAsyncThunk } from "@reduxjs/toolkit";
-import { fetchPoiTypService } from "../../../services/database/pois/fetchPoiTypService";
+import { fetchPoiTypService } from "../../../../services/database/pois/fetchPoiTypService";
 
 export const fetchPoiTypThunk = createAsyncThunk("poiTyp/fetch", async (_, thunkAPI) => {
   try {
diff --git a/redux/thunks/database/updatePoiThunk.js b/redux/thunks/database/pois/updatePoiThunk.js
similarity index 77%
rename from redux/thunks/database/updatePoiThunk.js
rename to redux/thunks/database/pois/updatePoiThunk.js
index 1a08e1e20..512781fa8 100644
--- a/redux/thunks/database/updatePoiThunk.js
+++ b/redux/thunks/database/pois/updatePoiThunk.js
@@ -1,7 +1,7 @@
 // /redux/thunks/database/updatePoiThunk.js
 
 import { createAsyncThunk } from "@reduxjs/toolkit";
-import { updatePoiService } from "../../../services/database/pois/updatePoiService";
+import { updatePoiService } from "../../../../services/database/pois/updatePoiService";
 
 export const updatePoiThunk = createAsyncThunk("pois/update", async (poi, thunkAPI) => {
   try {
diff --git a/redux/thunks/database/fetchGisLinesThunk.js b/redux/thunks/database/polylines/fetchGisLinesThunk.js
similarity index 69%
rename from redux/thunks/database/fetchGisLinesThunk.js
rename to redux/thunks/database/polylines/fetchGisLinesThunk.js
index e655a9cee..6e177d543 100644
--- a/redux/thunks/database/fetchGisLinesThunk.js
+++ b/redux/thunks/database/polylines/fetchGisLinesThunk.js
@@ -1,6 +1,6 @@
 // /redux/thunks/database/fetchGisLinesThunk.js
 import { createAsyncThunk } from "@reduxjs/toolkit";
-import { fetchGisLinesService } from "../../../services/database/polylines/fetchGisLinesService";
+import { fetchGisLinesService } from "../../../../services/database/polylines/fetchGisLinesService";
 
 export const fetchGisLinesThunk = createAsyncThunk("gisLines/fetch", async () => {
   return await fetchGisLinesService();