diff --git a/ds/CMakeLists.txt b/fx.collections/CMakeLists.txt similarity index 100% rename from ds/CMakeLists.txt rename to fx.collections/CMakeLists.txt diff --git a/ds/array.c b/fx.collections/array.c similarity index 100% rename from ds/array.c rename to fx.collections/array.c diff --git a/ds/bitbuffer.c b/fx.collections/bitbuffer.c similarity index 100% rename from ds/bitbuffer.c rename to fx.collections/bitbuffer.c diff --git a/ds/bitmap.c b/fx.collections/bitmap.c similarity index 100% rename from ds/bitmap.c rename to fx.collections/bitmap.c diff --git a/ds/buffer.c b/fx.collections/buffer.c similarity index 100% rename from ds/buffer.c rename to fx.collections/buffer.c diff --git a/ds/datetime.c b/fx.collections/datetime.c similarity index 100% rename from ds/datetime.c rename to fx.collections/datetime.c diff --git a/ds/dict.c b/fx.collections/dict.c similarity index 100% rename from ds/dict.c rename to fx.collections/dict.c diff --git a/ds/hashmap.c b/fx.collections/hashmap.c similarity index 100% rename from ds/hashmap.c rename to fx.collections/hashmap.c diff --git a/ds/include/fx/ds.h b/fx.collections/include/fx/ds.h similarity index 100% rename from ds/include/fx/ds.h rename to fx.collections/include/fx/ds.h diff --git a/ds/include/fx/ds/array.h b/fx.collections/include/fx/ds/array.h similarity index 100% rename from ds/include/fx/ds/array.h rename to fx.collections/include/fx/ds/array.h diff --git a/ds/include/fx/ds/bitbuffer.h b/fx.collections/include/fx/ds/bitbuffer.h similarity index 100% rename from ds/include/fx/ds/bitbuffer.h rename to fx.collections/include/fx/ds/bitbuffer.h diff --git a/ds/include/fx/ds/bitmap.h b/fx.collections/include/fx/ds/bitmap.h similarity index 100% rename from ds/include/fx/ds/bitmap.h rename to fx.collections/include/fx/ds/bitmap.h diff --git a/ds/include/fx/ds/buffer.h b/fx.collections/include/fx/ds/buffer.h similarity index 100% rename from ds/include/fx/ds/buffer.h rename to fx.collections/include/fx/ds/buffer.h diff --git a/ds/include/fx/ds/datetime.h b/fx.collections/include/fx/ds/datetime.h similarity index 100% rename from ds/include/fx/ds/datetime.h rename to fx.collections/include/fx/ds/datetime.h diff --git a/ds/include/fx/ds/dict.h b/fx.collections/include/fx/ds/dict.h similarity index 100% rename from ds/include/fx/ds/dict.h rename to fx.collections/include/fx/ds/dict.h diff --git a/ds/include/fx/ds/hashmap.h b/fx.collections/include/fx/ds/hashmap.h similarity index 100% rename from ds/include/fx/ds/hashmap.h rename to fx.collections/include/fx/ds/hashmap.h diff --git a/ds/include/fx/ds/list.h b/fx.collections/include/fx/ds/list.h similarity index 100% rename from ds/include/fx/ds/list.h rename to fx.collections/include/fx/ds/list.h diff --git a/ds/include/fx/ds/number.h b/fx.collections/include/fx/ds/number.h similarity index 100% rename from ds/include/fx/ds/number.h rename to fx.collections/include/fx/ds/number.h diff --git a/ds/include/fx/ds/string.h b/fx.collections/include/fx/ds/string.h similarity index 100% rename from ds/include/fx/ds/string.h rename to fx.collections/include/fx/ds/string.h diff --git a/ds/include/fx/ds/tree.h b/fx.collections/include/fx/ds/tree.h similarity index 100% rename from ds/include/fx/ds/tree.h rename to fx.collections/include/fx/ds/tree.h diff --git a/ds/include/fx/ds/uuid.h b/fx.collections/include/fx/ds/uuid.h similarity index 100% rename from ds/include/fx/ds/uuid.h rename to fx.collections/include/fx/ds/uuid.h diff --git a/ds/list.c b/fx.collections/list.c similarity index 100% rename from ds/list.c rename to fx.collections/list.c diff --git a/ds/number.c b/fx.collections/number.c similarity index 100% rename from ds/number.c rename to fx.collections/number.c diff --git a/ds/string.c b/fx.collections/string.c similarity index 100% rename from ds/string.c rename to fx.collections/string.c diff --git a/ds/tree.c b/fx.collections/tree.c similarity index 100% rename from ds/tree.c rename to fx.collections/tree.c diff --git a/ds/uuid.c b/fx.collections/uuid.c similarity index 100% rename from ds/uuid.c rename to fx.collections/uuid.c