diff --git a/src/backend/base/langflow/components/vectorstores/AstraDBSearch.py b/src/backend/base/langflow/components/vectorsearch/AstraDBSearch.py
similarity index 100%
rename from src/backend/base/langflow/components/vectorstores/AstraDBSearch.py
rename to src/backend/base/langflow/components/vectorsearch/AstraDBSearch.py
diff --git a/src/backend/base/langflow/components/vectorstores/ChromaSearch.py b/src/backend/base/langflow/components/vectorsearch/ChromaSearch.py
similarity index 100%
rename from src/backend/base/langflow/components/vectorstores/ChromaSearch.py
rename to src/backend/base/langflow/components/vectorsearch/ChromaSearch.py
diff --git a/src/backend/base/langflow/components/vectorstores/FAISSSearch.py b/src/backend/base/langflow/components/vectorsearch/FAISSSearch.py
similarity index 100%
rename from src/backend/base/langflow/components/vectorstores/FAISSSearch.py
rename to src/backend/base/langflow/components/vectorsearch/FAISSSearch.py
diff --git a/src/backend/base/langflow/components/vectorstores/MongoDBAtlasVectorSearch.py b/src/backend/base/langflow/components/vectorsearch/MongoDBAtlasVectorSearch.py
similarity index 100%
rename from src/backend/base/langflow/components/vectorstores/MongoDBAtlasVectorSearch.py
rename to src/backend/base/langflow/components/vectorsearch/MongoDBAtlasVectorSearch.py
diff --git a/src/backend/base/langflow/components/vectorstores/PineconeSearch.py b/src/backend/base/langflow/components/vectorsearch/PineconeSearch.py
similarity index 100%
rename from src/backend/base/langflow/components/vectorstores/PineconeSearch.py
rename to src/backend/base/langflow/components/vectorsearch/PineconeSearch.py
diff --git a/src/backend/base/langflow/components/vectorstores/QdrantSearch.py b/src/backend/base/langflow/components/vectorsearch/QdrantSearch.py
similarity index 100%
rename from src/backend/base/langflow/components/vectorstores/QdrantSearch.py
rename to src/backend/base/langflow/components/vectorsearch/QdrantSearch.py
diff --git a/src/backend/base/langflow/components/vectorstores/RedisSearch.py b/src/backend/base/langflow/components/vectorsearch/RedisSearch.py
similarity index 100%
rename from src/backend/base/langflow/components/vectorstores/RedisSearch.py
rename to src/backend/base/langflow/components/vectorsearch/RedisSearch.py
diff --git a/src/backend/base/langflow/components/vectorstores/SupabaseVectorStoreSearch.py b/src/backend/base/langflow/components/vectorsearch/SupabaseVectorStoreSearch.py
similarity index 100%
rename from src/backend/base/langflow/components/vectorstores/SupabaseVectorStoreSearch.py
rename to src/backend/base/langflow/components/vectorsearch/SupabaseVectorStoreSearch.py
diff --git a/src/backend/base/langflow/components/vectorstores/VectaraSearch.py b/src/backend/base/langflow/components/vectorsearch/VectaraSearch.py
similarity index 100%
rename from src/backend/base/langflow/components/vectorstores/VectaraSearch.py
rename to src/backend/base/langflow/components/vectorsearch/VectaraSearch.py
diff --git a/src/backend/base/langflow/components/vectorstores/WeaviateSearch.py b/src/backend/base/langflow/components/vectorsearch/WeaviateSearch.py
similarity index 100%
rename from src/backend/base/langflow/components/vectorstores/WeaviateSearch.py
rename to src/backend/base/langflow/components/vectorsearch/WeaviateSearch.py
diff --git a/src/backend/base/langflow/components/vectorsearch/__init__.py b/src/backend/base/langflow/components/vectorsearch/__init__.py
new file mode 100644
index 000000000..28ea85fce
--- /dev/null
+++ b/src/backend/base/langflow/components/vectorsearch/__init__.py
@@ -0,0 +1,25 @@
+from .AstraDBSearch import AstraDBSearchComponent
+from .ChromaSearch import ChromaSearchComponent
+from .FAISSSearch import FAISSSearchComponent
+from .MongoDBAtlasVectorSearch import MongoDBAtlasSearchComponent
+from .PineconeSearch import PineconeSearchComponent
+from .QdrantSearch import QdrantSearchComponent
+from .RedisSearch import RedisSearchComponent
+from .SupabaseVectorStoreSearch import SupabaseSearchComponent
+from .VectaraSearch import VectaraSearchComponent
+from .WeaviateSearch import WeaviateSearchVectorStore
+from .pgvectorSearch import PGVectorSearchComponent
+
+__all__ = [
+    "AstraDBSearchComponent",
+    "ChromaSearchComponent",
+    "FAISSSearchComponent",
+    "MongoDBAtlasSearchComponent",
+    "PineconeSearchComponent",
+    "QdrantSearchComponent",
+    "RedisSearchComponent",
+    "SupabaseSearchComponent",
+    "VectaraSearchComponent",
+    "WeaviateSearchVectorStore",
+    "PGVectorSearchComponent",
+]
diff --git a/src/backend/base/langflow/components/vectorstores/pgvectorSearch.py b/src/backend/base/langflow/components/vectorsearch/pgvectorSearch.py
similarity index 100%
rename from src/backend/base/langflow/components/vectorstores/pgvectorSearch.py
rename to src/backend/base/langflow/components/vectorsearch/pgvectorSearch.py
diff --git a/src/backend/base/langflow/components/vectorstores/__init__.py b/src/backend/base/langflow/components/vectorstores/__init__.py
index a2ddfa53d..48e1bf9c7 100644
--- a/src/backend/base/langflow/components/vectorstores/__init__.py
+++ b/src/backend/base/langflow/components/vectorstores/__init__.py
@@ -1,44 +1,26 @@
+from .AstraDB import AstraDBVectorStoreComponent
 from .Chroma import ChromaComponent
-from .ChromaSearch import ChromaSearchComponent
 from .FAISS import FAISSComponent
-from .FAISSSearch import FAISSSearchComponent
 from .MongoDBAtlasVector import MongoDBAtlasComponent
-from .MongoDBAtlasVectorSearch import MongoDBAtlasSearchComponent
 from .Pinecone import PineconeComponent
-from .PineconeSearch import PineconeSearchComponent
 from .Qdrant import QdrantComponent
-from .QdrantSearch import QdrantSearchComponent
 from .Redis import RedisComponent
-from .RedisSearch import RedisSearchComponent
 from .SupabaseVectorStore import SupabaseComponent
-from .SupabaseVectorStoreSearch import SupabaseSearchComponent
 from .Vectara import VectaraComponent
-from .VectaraSearch import VectaraSearchComponent
 from .Weaviate import WeaviateVectorStoreComponent
-from .WeaviateSearch import WeaviateSearchVectorStore
 from .pgvector import PGVectorComponent
-from .pgvectorSearch import PGVectorSearchComponent
 
 __all__ = [
+    "AstraDBVectorStoreComponent",
     "ChromaComponent",
-    "ChromaSearchComponent",
     "FAISSComponent",
-    "FAISSSearchComponent",
     "MongoDBAtlasComponent",
-    "MongoDBAtlasSearchComponent",
     "PineconeComponent",
-    "PineconeSearchComponent",
     "QdrantComponent",
-    "QdrantSearchComponent",
     "RedisComponent",
-    "RedisSearchComponent",
     "SupabaseComponent",
-    "SupabaseSearchComponent",
     "VectaraComponent",
-    "VectaraSearchComponent",
     "WeaviateVectorStoreComponent",
-    "WeaviateSearchVectorStore",
     "base",
     "PGVectorComponent",
-    "PGVectorSearchComponent",
 ]
diff --git a/src/frontend/package.json b/src/frontend/package.json
index c6473cf3a..788d8459f 100644
--- a/src/frontend/package.json
+++ b/src/frontend/package.json
@@ -128,4 +128,4 @@
     "ua-parser-js": "^1.0.37",
     "vite": "^4.5.2"
   }
-}
\ No newline at end of file
+}
diff --git a/src/frontend/src/constants/constants.ts b/src/frontend/src/constants/constants.ts
index 79acaf142..6c9a1162b 100644
--- a/src/frontend/src/constants/constants.ts
+++ b/src/frontend/src/constants/constants.ts
@@ -732,12 +732,12 @@ export const PRIORITY_SIDEBAR_ORDER = [
   "saved_components",
   "inputs",
   "outputs",
-  "prompts",
   "data",
   "prompt",
   "models",
+  "vectorstores",
+  "vectorsearch",
   "helpers",
-  "experimental",
 ];
 export const NATIVE_CATEGORIES = [
   "inputs",
diff --git a/src/frontend/src/utils/styleUtils.ts b/src/frontend/src/utils/styleUtils.ts
index 0d40fbc3a..c188c4cf7 100644
--- a/src/frontend/src/utils/styleUtils.ts
+++ b/src/frontend/src/utils/styleUtils.ts
@@ -236,6 +236,7 @@ export const nodeColors: { [char: string]: string } = {
   embeddings: "#42BAA7",
   documentloaders: "#7AAE42",
   vectorstores: "#AA8742",
+  vectorsearch: "#AA8742",
   textsplitters: "#B47CB5",
   toolkits: "#DB2C2C",
   wrappers: "#E6277A",
@@ -267,6 +268,7 @@ export const nodeNames: { [char: string]: string } = {
   embeddings: "Embeddings",
   documentloaders: "Loaders",
   vectorstores: "Vector Stores",
+  vectorsearch: "Vector Search",
   toolkits: "Toolkits",
   wrappers: "Wrappers",
   textsplitters: "Text Splitters",
@@ -369,6 +371,7 @@ export const nodeIconsLucide: iconsType = {
   saved_components: GradientSave,
   documentloaders: Paperclip,
   vectorstores: Layers,
+  vectorsearch: Search,
   toolkits: Package2,
   textsplitters: Scissors,
   wrappers: Gift,