diff --git a/MSTeams.psd1 b/MsftTeams.psd1
similarity index 86%
rename from MSTeams.psd1
rename to MsftTeams.psd1
index f6683a1..d9922b0 100644
Binary files a/MSTeams.psd1 and b/MsftTeams.psd1 differ
diff --git a/MSTeams.psm1 b/MsftTeams.psm1
similarity index 96%
rename from MSTeams.psm1
rename to MsftTeams.psm1
index 409b1a4..4c3839c 100644
--- a/MSTeams.psm1
+++ b/MsftTeams.psm1
@@ -1,9 +1,9 @@
 # Dot source Public function file
-. $psscriptroot\New-TeamsMessage.ps1
-. $psscriptroot\Button.ps1
-. $psscriptroot\internal\ConvertFrom-Hashtable.ps1
-. $psscriptroot\internal\New-BaseJsonObj.ps1
-. $psscriptroot\internal\New-ImageObject.ps1
+. $psscriptroot\public\New-TeamsMessage.ps1
+. $psscriptroot\public\Button.ps1
+. $psscriptroot\private\ConvertFrom-Hashtable.ps1
+. $psscriptroot\private\New-BaseJsonObj.ps1
+. $psscriptroot\private\New-ImageObject.ps1
 
 # Import Color Settings
 $ColorMap = @{
diff --git a/Internal/BaseJsonTemplate.psd1 b/private/BaseJsonTemplate.psd1
similarity index 100%
rename from Internal/BaseJsonTemplate.psd1
rename to private/BaseJsonTemplate.psd1
diff --git a/Internal/ButtonJsonTemplate.psd1 b/private/ButtonJsonTemplate.psd1
similarity index 100%
rename from Internal/ButtonJsonTemplate.psd1
rename to private/ButtonJsonTemplate.psd1
diff --git a/Internal/ConvertFrom-Hashtable.ps1 b/private/ConvertFrom-Hashtable.ps1
similarity index 100%
rename from Internal/ConvertFrom-Hashtable.ps1
rename to private/ConvertFrom-Hashtable.ps1
diff --git a/Internal/ImageJsonTemplate.psd1 b/private/ImageJsonTemplate.psd1
similarity index 100%
rename from Internal/ImageJsonTemplate.psd1
rename to private/ImageJsonTemplate.psd1
diff --git a/Internal/New-BaseJsonObj.ps1 b/private/New-BaseJsonObj.ps1
similarity index 100%
rename from Internal/New-BaseJsonObj.ps1
rename to private/New-BaseJsonObj.ps1
diff --git a/Internal/New-ImageObject.ps1 b/private/New-ImageObject.ps1
similarity index 100%
rename from Internal/New-ImageObject.ps1
rename to private/New-ImageObject.ps1
diff --git a/Button.ps1 b/public/Button.ps1
similarity index 100%
rename from Button.ps1
rename to public/Button.ps1
diff --git a/New-TeamsMessage.ps1 b/public/New-TeamsMessage.ps1
similarity index 100%
rename from New-TeamsMessage.ps1
rename to public/New-TeamsMessage.ps1