diff --git a/OpenChange/GCSSpecialQueries+OpenChange.h b/SoObjects/SOGo/GCSSpecialQueries+SOGoCacheObject.h
similarity index 100%
rename from OpenChange/GCSSpecialQueries+OpenChange.h
rename to SoObjects/SOGo/GCSSpecialQueries+SOGoCacheObject.h
diff --git a/OpenChange/GCSSpecialQueries+OpenChange.m b/SoObjects/SOGo/GCSSpecialQueries+SOGoCacheObject.m
similarity index 100%
rename from OpenChange/GCSSpecialQueries+OpenChange.m
rename to SoObjects/SOGo/GCSSpecialQueries+SOGoCacheObject.m
diff --git a/OpenChange/SOGoMAPIDBFolder.h b/SoObjects/SOGo/SOGoCacheGCSFolder.h
similarity index 100%
rename from OpenChange/SOGoMAPIDBFolder.h
rename to SoObjects/SOGo/SOGoCacheGCSFolder.h
diff --git a/OpenChange/SOGoMAPIDBFolder.m b/SoObjects/SOGo/SOGoCacheGCSFolder.m
similarity index 100%
rename from OpenChange/SOGoMAPIDBFolder.m
rename to SoObjects/SOGo/SOGoCacheGCSFolder.m
diff --git a/OpenChange/SOGoMAPIDBObject.h b/SoObjects/SOGo/SOGoCacheGCSObject.h
similarity index 100%
rename from OpenChange/SOGoMAPIDBObject.h
rename to SoObjects/SOGo/SOGoCacheGCSObject.h
diff --git a/OpenChange/SOGoMAPIDBObject.m b/SoObjects/SOGo/SOGoCacheGCSObject.m
similarity index 100%
rename from OpenChange/SOGoMAPIDBObject.m
rename to SoObjects/SOGo/SOGoCacheGCSObject.m
diff --git a/OpenChange/SOGoMAPIObject.h b/SoObjects/SOGo/SOGoCacheObject.h
similarity index 100%
rename from OpenChange/SOGoMAPIObject.h
rename to SoObjects/SOGo/SOGoCacheObject.h
diff --git a/OpenChange/SOGoMAPIObject.m b/SoObjects/SOGo/SOGoCacheObject.m
similarity index 100%
rename from OpenChange/SOGoMAPIObject.m
rename to SoObjects/SOGo/SOGoCacheObject.m