Change directory structure to match emplty template

.forceignore

@@ -4,6 +4,8 @@
 
 package.xml
 
+force-app/main/default/profiles/**
+
 # LWC configuration files
 **/jsconfig.json
 **/.eslintrc.json

.github/workflows/ci.yml

@@ -6,11 +6,11 @@ on:
   push:
     branches: [ master ]
     paths:
-      - 'sfdx-source/**'
+      - 'force-app/**'
   pull_request:
     branches: [ master ]
     paths:
-      - 'sfdx-source/**'
+      - 'force-app/**'
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

sfdx-source/apex-fp/main/classes/collection/DecimalCollection.cls-meta.xml → force-app/main/default/classes/collection/DecimalCollection.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/collection/DoubleCollection.cls-meta.xml → force-app/main/default/classes/collection/DoubleCollection.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/collection/SObjectCollection.cls → force-app/main/default/classes/collection/SObjectCollection.cls

@@ -412,7 +412,7 @@ public with sharing class SObjectCollection {
 		for (SObject record : records) {
 			decimals.add((Decimal) fieldReader.read(record, relation));
 		}
-		return new DecimalCollection(decimals);
+		return DecimalCollection.of(decimals);
 	}
 
 	public DoubleCollection mapToDouble(Schema.SObjectField field) {
@@ -424,7 +424,7 @@ public with sharing class SObjectCollection {
 		for (SObject record : records) {
 			doubles.add((Double) fieldReader.read(record, relation));
 		}
-		return new DoubleCollection(doubles);
+		return DoubleCollection.of(doubles);
 	}
 
 	public OptionalSObject find(SObjectPredicate predicate) {

sfdx-source/apex-fp/main/classes/collection/SObjectCollection.cls-meta.xml → force-app/main/default/classes/collection/SObjectCollection.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/exception/IllegalOperationException.cls-meta.xml → force-app/main/default/classes/exception/IllegalOperationException.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/exception/LambdaException.cls-meta.xml → force-app/main/default/classes/exception/LambdaException.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/function/DebugSObject.cls-meta.xml → force-app/main/default/classes/function/DebugSObject.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/function/DecimalPredicate.cls-meta.xml → force-app/main/default/classes/function/DecimalPredicate.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/function/DoublePredicate.cls-meta.xml → force-app/main/default/classes/function/DoublePredicate.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/function/FieldMatchCondition.cls-meta.xml → force-app/main/default/classes/function/FieldMatchCondition.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/function/FieldsMatch.cls-meta.xml → force-app/main/default/classes/function/FieldsMatch.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/function/Fn.cls-meta.xml → force-app/main/default/classes/function/Fn.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/function/IncompleteFieldsMatch.cls-meta.xml → force-app/main/default/classes/function/IncompleteFieldsMatch.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/function/MapToObject.cls-meta.xml → force-app/main/default/classes/function/MapToObject.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/function/MapToSObject.cls-meta.xml → force-app/main/default/classes/function/MapToSObject.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/function/MatchSObject.cls-meta.xml → force-app/main/default/classes/function/MatchSObject.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/function/ModifySObject.cls-meta.xml → force-app/main/default/classes/function/ModifySObject.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/function/RecordFieldsMatch.cls-meta.xml → force-app/main/default/classes/function/RecordFieldsMatch.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/function/SObjectFunction.cls-meta.xml → force-app/main/default/classes/function/SObjectFunction.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/function/SObjectFunctions.cls-meta.xml → force-app/main/default/classes/function/SObjectFunctions.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/function/SObjectNotNull.cls-meta.xml → force-app/main/default/classes/function/SObjectNotNull.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/function/SObjectPredicate.cls-meta.xml → force-app/main/default/classes/function/SObjectPredicate.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/function/SObjectToObjectFunction.cls-meta.xml → force-app/main/default/classes/function/SObjectToObjectFunction.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/function/SObjectToSObjectFunction.cls-meta.xml → force-app/main/default/classes/function/SObjectToSObjectFunction.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/stream/DoubleStream.cls-meta.xml → force-app/main/default/classes/stream/DoubleStream.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/stream/SObjectStream.cls-meta.xml → force-app/main/default/classes/stream/SObjectStream.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/stream/SObjectStreamFilter.cls-meta.xml → force-app/main/default/classes/stream/SObjectStreamFilter.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/stream/SObjectStreamMapAll.cls-meta.xml → force-app/main/default/classes/stream/SObjectStreamMapAll.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/stream/SObjectStreamMapSome.cls-meta.xml → force-app/main/default/classes/stream/SObjectStreamMapSome.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/stream/SObjectStreamRemove.cls-meta.xml → force-app/main/default/classes/stream/SObjectStreamRemove.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/test/classes/TestUtility.cls-meta.xml → force-app/main/default/classes/test/classes/TestUtility.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/test/classes/collection/DecimalCollectionTest.cls-meta.xml → force-app/main/default/classes/test/classes/collection/DecimalCollectionTest.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/test/classes/collection/DoubleCollectionTest.cls-meta.xml → force-app/main/default/classes/test/classes/collection/DoubleCollectionTest.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/test/classes/collection/SObjectCollectionTest.cls-meta.xml → force-app/main/default/classes/test/classes/collection/SObjectCollectionTest.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/test/classes/function/MapToObjectTest.cls-meta.xml → force-app/main/default/classes/test/classes/function/MapToObjectTest.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/test/classes/function/MapToSObjectTest.cls-meta.xml → force-app/main/default/classes/test/classes/function/MapToSObjectTest.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/test/classes/function/ModifySObjectTest.cls-meta.xml → force-app/main/default/classes/test/classes/function/ModifySObjectTest.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/test/classes/stream/SObjectStreamTest.cls-meta.xml → force-app/main/default/classes/test/classes/stream/SObjectStreamTest.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/test/classes/util/OptionalDecimalTest.cls-meta.xml → force-app/main/default/classes/test/classes/util/OptionalDecimalTest.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/test/classes/util/OptionalDoubleTest.cls-meta.xml → force-app/main/default/classes/test/classes/util/OptionalDoubleTest.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/test/classes/util/OptionalSObjectTest.cls-meta.xml → force-app/main/default/classes/test/classes/util/OptionalSObjectTest.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/test/classes/util/PrimitiveComparerTest.cls-meta.xml → force-app/main/default/classes/test/classes/util/PrimitiveComparerTest.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/test/classes/util/SObjectFieldReaderTest.cls-meta.xml → force-app/main/default/classes/test/classes/util/SObjectFieldReaderTest.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/util/BinaryRelation.cls-meta.xml → force-app/main/default/classes/util/BinaryRelation.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/util/OptionalDecimal.cls-meta.xml → force-app/main/default/classes/util/OptionalDecimal.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/util/OptionalDouble.cls-meta.xml → force-app/main/default/classes/util/OptionalDouble.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/util/OptionalSObject.cls-meta.xml → force-app/main/default/classes/util/OptionalSObject.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/util/PrimitiveComparer.cls-meta.xml → force-app/main/default/classes/util/PrimitiveComparer.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-source/apex-fp/main/classes/util/SObjectFieldReader.cls-meta.xml → force-app/main/default/classes/util/SObjectFieldReader.cls-meta.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>56.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>

sfdx-project.json

@@ -1,7 +1,7 @@
 {
   "packageDirectories": [
     {
-      "path": "sfdx-source/apex-fp",
+      "path": "force-app",
       "default": true
     }
   ],