diff --git a/sfdx-project.json b/sfdx-project.json
index 6cfb92e19b7..c99989e6b3f 100644
--- a/sfdx-project.json
+++ b/sfdx-project.json
@@ -1,7 +1,7 @@
 {
     "packageDirectories": [
         {
-            "path": "sfdx-source/apex-common",
+            "path": "sfdx-source",
             "default": true
         }
     ],
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_Comparator.cls b/sfdx-source/apex-extensions/default/classes/criteria/fflib_Comparator.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_Comparator.cls
rename to sfdx-source/apex-extensions/default/classes/criteria/fflib_Comparator.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_Comparator.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/criteria/fflib_Comparator.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_Comparator.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/criteria/fflib_Comparator.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_Criteria.cls b/sfdx-source/apex-extensions/default/classes/criteria/fflib_Criteria.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_Criteria.cls
rename to sfdx-source/apex-extensions/default/classes/criteria/fflib_Criteria.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_Criteria.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/criteria/fflib_Criteria.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_Criteria.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/criteria/fflib_Criteria.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_ISoqlable.cls b/sfdx-source/apex-extensions/default/classes/criteria/fflib_ISoqlable.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_ISoqlable.cls
rename to sfdx-source/apex-extensions/default/classes/criteria/fflib_ISoqlable.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_ISoqlable.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/criteria/fflib_ISoqlable.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_ISoqlable.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/criteria/fflib_ISoqlable.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_Operator.cls b/sfdx-source/apex-extensions/default/classes/criteria/fflib_Operator.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_Operator.cls
rename to sfdx-source/apex-extensions/default/classes/criteria/fflib_Operator.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_Operator.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/criteria/fflib_Operator.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/criteria/fflib_Operator.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/criteria/fflib_Operator.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_DateTimes.cls b/sfdx-source/apex-extensions/default/classes/domains/fflib_DateTimes.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_DateTimes.cls
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_DateTimes.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_DateTimes.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/domains/fflib_DateTimes.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_DateTimes.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_DateTimes.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Dates.cls b/sfdx-source/apex-extensions/default/classes/domains/fflib_Dates.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Dates.cls
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_Dates.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Dates.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/domains/fflib_Dates.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Dates.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_Dates.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Decimals.cls b/sfdx-source/apex-extensions/default/classes/domains/fflib_Decimals.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Decimals.cls
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_Decimals.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Decimals.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/domains/fflib_Decimals.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Decimals.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_Decimals.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Doubles.cls b/sfdx-source/apex-extensions/default/classes/domains/fflib_Doubles.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Doubles.cls
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_Doubles.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Doubles.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/domains/fflib_Doubles.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Doubles.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_Doubles.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Ids.cls b/sfdx-source/apex-extensions/default/classes/domains/fflib_Ids.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Ids.cls
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_Ids.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Ids.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/domains/fflib_Ids.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Ids.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_Ids.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Integers.cls b/sfdx-source/apex-extensions/default/classes/domains/fflib_Integers.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Integers.cls
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_Integers.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Integers.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/domains/fflib_Integers.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Integers.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_Integers.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Longs.cls b/sfdx-source/apex-extensions/default/classes/domains/fflib_Longs.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Longs.cls
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_Longs.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Longs.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/domains/fflib_Longs.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Longs.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_Longs.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Objects2.cls b/sfdx-source/apex-extensions/default/classes/domains/fflib_Objects2.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Objects2.cls
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_Objects2.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Objects2.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/domains/fflib_Objects2.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Objects2.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_Objects2.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_SObjects2.cls b/sfdx-source/apex-extensions/default/classes/domains/fflib_SObjects2.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_SObjects2.cls
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_SObjects2.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_SObjects2.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/domains/fflib_SObjects2.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_SObjects2.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_SObjects2.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Strings.cls b/sfdx-source/apex-extensions/default/classes/domains/fflib_Strings.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Strings.cls
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_Strings.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Strings.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/domains/fflib_Strings.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/fflib_Strings.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/domains/fflib_Strings.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/tests/fflib_PrimitiveDomainsTest.cls b/sfdx-source/apex-extensions/default/classes/domains/tests/fflib_PrimitiveDomainsTest.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/tests/fflib_PrimitiveDomainsTest.cls
rename to sfdx-source/apex-extensions/default/classes/domains/tests/fflib_PrimitiveDomainsTest.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/tests/fflib_PrimitiveDomainsTest.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/domains/tests/fflib_PrimitiveDomainsTest.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/tests/fflib_PrimitiveDomainsTest.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/domains/tests/fflib_PrimitiveDomainsTest.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/tests/fflib_SObjects2Test.cls b/sfdx-source/apex-extensions/default/classes/domains/tests/fflib_SObjects2Test.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/tests/fflib_SObjects2Test.cls
rename to sfdx-source/apex-extensions/default/classes/domains/tests/fflib_SObjects2Test.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/domains/tests/fflib_SObjects2Test.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/domains/tests/fflib_SObjects2Test.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/domains/tests/fflib_SObjects2Test.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/domains/tests/fflib_SObjects2Test.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/tests/fflib_ComparatorTest.cls b/sfdx-source/apex-extensions/default/classes/tests/fflib_ComparatorTest.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/tests/fflib_ComparatorTest.cls
rename to sfdx-source/apex-extensions/default/classes/tests/fflib_ComparatorTest.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/tests/fflib_ComparatorTest.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/tests/fflib_ComparatorTest.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/tests/fflib_ComparatorTest.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/tests/fflib_ComparatorTest.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/tests/fflib_CriteriaTest.cls b/sfdx-source/apex-extensions/default/classes/tests/fflib_CriteriaTest.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/tests/fflib_CriteriaTest.cls
rename to sfdx-source/apex-extensions/default/classes/tests/fflib_CriteriaTest.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/tests/fflib_CriteriaTest.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/tests/fflib_CriteriaTest.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/tests/fflib_CriteriaTest.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/tests/fflib_CriteriaTest.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/utils/fflib_MockSObjectUtil.cls b/sfdx-source/apex-extensions/default/classes/utils/fflib_MockSObjectUtil.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/utils/fflib_MockSObjectUtil.cls
rename to sfdx-source/apex-extensions/default/classes/utils/fflib_MockSObjectUtil.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/utils/fflib_MockSObjectUtil.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/utils/fflib_MockSObjectUtil.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/utils/fflib_MockSObjectUtil.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/utils/fflib_MockSObjectUtil.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/utils/fflib_OperatorUtils.cls b/sfdx-source/apex-extensions/default/classes/utils/fflib_OperatorUtils.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/utils/fflib_OperatorUtils.cls
rename to sfdx-source/apex-extensions/default/classes/utils/fflib_OperatorUtils.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/utils/fflib_OperatorUtils.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/utils/fflib_OperatorUtils.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/utils/fflib_OperatorUtils.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/utils/fflib_OperatorUtils.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/utils/fflib_StringUtils.cls b/sfdx-source/apex-extensions/default/classes/utils/fflib_StringUtils.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/utils/fflib_StringUtils.cls
rename to sfdx-source/apex-extensions/default/classes/utils/fflib_StringUtils.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/utils/fflib_StringUtils.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/utils/fflib_StringUtils.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/utils/fflib_StringUtils.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/utils/fflib_StringUtils.cls-meta.xml
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/utils/tests/fflib_OperatorUtilsTest.cls b/sfdx-source/apex-extensions/default/classes/utils/tests/fflib_OperatorUtilsTest.cls
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/utils/tests/fflib_OperatorUtilsTest.cls
rename to sfdx-source/apex-extensions/default/classes/utils/tests/fflib_OperatorUtilsTest.cls
diff --git a/sfdx-source/fflib-apex-extensions/default/classes/utils/tests/fflib_OperatorUtilsTest.cls-meta.xml b/sfdx-source/apex-extensions/default/classes/utils/tests/fflib_OperatorUtilsTest.cls-meta.xml
similarity index 100%
rename from sfdx-source/fflib-apex-extensions/default/classes/utils/tests/fflib_OperatorUtilsTest.cls-meta.xml
rename to sfdx-source/apex-extensions/default/classes/utils/tests/fflib_OperatorUtilsTest.cls-meta.xml