diff --git a/Pilz.Win32/Mapped/IconExtractor.vb b/Pilz.Win32/Mapped/FileTypeIcons.vb
similarity index 50%
rename from Pilz.Win32/Mapped/IconExtractor.vb
rename to Pilz.Win32/Mapped/FileTypeIcons.vb
index f2058ec..feb0cf5 100644
--- a/Pilz.Win32/Mapped/IconExtractor.vb
+++ b/Pilz.Win32/Mapped/FileTypeIcons.vb
@@ -2,16 +2,16 @@
 
 Namespace Mapped
 
-    Public Class IconExtractor
+    Public Module FileTypeIcons
 
-        Public Shared Function ExtractIconFromFilePath(filePath As String, size As SystemIconSize) As Icon
+        Public Function ExtractIconFromFilePath(filePath As String, size As SystemIconSize) As Icon
             Return Internals.IconExtractor.ExtractIcon(filePath, size)
         End Function
 
-        Public Shared Function ExtractIconFromFileExtension(fileExtension As String, size As SystemIconSize)
+        Public Function ExtractIconFromFileExtension(fileExtension As String, size As SystemIconSize)
             Return Internals.IconFactory.IconFromExtensionShell(fileExtension, size)
         End Function
 
-    End Class
+    End Module
 
 End Namespace