diff --git a/sfdx-source/apex-extensions/main/logger/classes/fflib_PlatformEventDomain.cls b/sfdx-source/apex-extensions/main/logger/classes/fflib_PlatformEventDomain.cls
index 3b58590..6150c1d 100644
--- a/sfdx-source/apex-extensions/main/logger/classes/fflib_PlatformEventDomain.cls
+++ b/sfdx-source/apex-extensions/main/logger/classes/fflib_PlatformEventDomain.cls
@@ -28,7 +28,7 @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-public abstract with sharing class fflib_PlatformEventDomain implements ffllib_IPlatformEventDomain
+public abstract with sharing class fflib_PlatformEventDomain implements fflib_IPlatformEventDomain
 {
 
 	protected List<SObject> Records { get; private set; }
diff --git a/sfdx-source/apex-extensions/main/logger/classes/fflib_ILogAppender.cls b/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogAppender.cls
similarity index 100%
rename from sfdx-source/apex-extensions/main/logger/classes/fflib_ILogAppender.cls
rename to sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogAppender.cls
diff --git a/sfdx-source/apex-extensions/main/logger/classes/fflib_ILogAppender.cls-meta.xml b/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogAppender.cls-meta.xml
similarity index 100%
rename from sfdx-source/apex-extensions/main/logger/classes/fflib_ILogAppender.cls-meta.xml
rename to sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogAppender.cls-meta.xml
diff --git a/sfdx-source/apex-extensions/main/logger/classes/fflib_ILogMessageFormatter.cls b/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogMessageFormatter.cls
similarity index 100%
rename from sfdx-source/apex-extensions/main/logger/classes/fflib_ILogMessageFormatter.cls
rename to sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogMessageFormatter.cls
diff --git a/sfdx-source/apex-extensions/main/logger/classes/fflib_ILogMessageFormatter.cls-meta.xml b/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogMessageFormatter.cls-meta.xml
similarity index 100%
rename from sfdx-source/apex-extensions/main/logger/classes/fflib_ILogMessageFormatter.cls-meta.xml
rename to sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogMessageFormatter.cls-meta.xml
diff --git a/sfdx-source/apex-extensions/main/logger/classes/fflib_ILogger.cls b/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogger.cls
similarity index 100%
rename from sfdx-source/apex-extensions/main/logger/classes/fflib_ILogger.cls
rename to sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogger.cls
diff --git a/sfdx-source/apex-extensions/main/logger/classes/fflib_ILogger.cls-meta.xml b/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogger.cls-meta.xml
similarity index 100%
rename from sfdx-source/apex-extensions/main/logger/classes/fflib_ILogger.cls-meta.xml
rename to sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_ILogger.cls-meta.xml
diff --git a/sfdx-source/apex-extensions/main/logger/classes/ffllib_IPlatformEventDomain.cls b/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_IPlatformEventDomain.cls
similarity index 97%
rename from sfdx-source/apex-extensions/main/logger/classes/ffllib_IPlatformEventDomain.cls
rename to sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_IPlatformEventDomain.cls
index eabe777..dac792f 100644
--- a/sfdx-source/apex-extensions/main/logger/classes/ffllib_IPlatformEventDomain.cls
+++ b/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_IPlatformEventDomain.cls
@@ -28,7 +28,7 @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-public interface ffllib_IPlatformEventDomain
+public interface fflib_IPlatformEventDomain
 {
 	void run();
 }
\ No newline at end of file
diff --git a/sfdx-source/apex-extensions/main/logger/classes/ffllib_IPlatformEventDomain.cls-meta.xml b/sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_IPlatformEventDomain.cls-meta.xml
similarity index 100%
rename from sfdx-source/apex-extensions/main/logger/classes/ffllib_IPlatformEventDomain.cls-meta.xml
rename to sfdx-source/apex-extensions/main/logger/classes/interfaces/fflib_IPlatformEventDomain.cls-meta.xml