diff --git a/src/server/game/Maps/Cell/Cell.h b/src/server/game/Grids/Cell.h
similarity index 100%
rename from src/server/game/Maps/Cell/Cell.h
rename to src/server/game/Grids/Cell.h
diff --git a/src/server/game/Maps/Cell/CellImpl.h b/src/server/game/Grids/CellImpl.h
similarity index 100%
rename from src/server/game/Maps/Cell/CellImpl.h
rename to src/server/game/Grids/CellImpl.h
diff --git a/src/server/game/Maps/Grid/GridDefines.h b/src/server/game/Grids/GridDefines.h
similarity index 100%
rename from src/server/game/Maps/Grid/GridDefines.h
rename to src/server/game/Grids/GridDefines.h
diff --git a/src/server/game/Maps/Grid/GridNotifiers.cpp b/src/server/game/Grids/GridNotifiers.cpp
similarity index 100%
rename from src/server/game/Maps/Grid/GridNotifiers.cpp
rename to src/server/game/Grids/GridNotifiers.cpp
diff --git a/src/server/game/Maps/Grid/GridNotifiers.h b/src/server/game/Grids/GridNotifiers.h
similarity index 100%
rename from src/server/game/Maps/Grid/GridNotifiers.h
rename to src/server/game/Grids/GridNotifiers.h
diff --git a/src/server/game/Maps/Grid/GridNotifiersImpl.h b/src/server/game/Grids/GridNotifiersImpl.h
similarity index 100%
rename from src/server/game/Maps/Grid/GridNotifiersImpl.h
rename to src/server/game/Grids/GridNotifiersImpl.h
diff --git a/src/server/game/Maps/Grid/GridStates.cpp b/src/server/game/Grids/GridStates.cpp
similarity index 100%
rename from src/server/game/Maps/Grid/GridStates.cpp
rename to src/server/game/Grids/GridStates.cpp
diff --git a/src/server/game/Maps/Grid/GridStates.h b/src/server/game/Grids/GridStates.h
similarity index 100%
rename from src/server/game/Maps/Grid/GridStates.h
rename to src/server/game/Grids/GridStates.h
diff --git a/src/server/game/Maps/Grid/ObjectGridLoader.cpp b/src/server/game/Grids/ObjectGridLoader.cpp
similarity index 100%
rename from src/server/game/Maps/Grid/ObjectGridLoader.cpp
rename to src/server/game/Grids/ObjectGridLoader.cpp
diff --git a/src/server/game/Maps/Grid/ObjectGridLoader.h b/src/server/game/Grids/ObjectGridLoader.h
similarity index 100%
rename from src/server/game/Maps/Grid/ObjectGridLoader.h
rename to src/server/game/Grids/ObjectGridLoader.h