diff --git a/cleanW10.ps1 b/cleanW10.ps1
index bcd583d..77643d4 100755
--- a/cleanW10.ps1
+++ b/cleanW10.ps1
@@ -6,27 +6,38 @@ $HOST_IP = "0.0.0.0"
 $ErrorActionPreference = "SilentlyContinue"
 
 #Thanks to https://gist.github.com/markembling/173887
-function block_shitty_host {
-    param([string]$filename, [string]$ip, [string]$hostname)
-    remove-host $filename $hostname
-    Write-Host -NoNewline "`t$hostname :"
-    try {
-        if ( ! $(is_host_present $filename $hostname) ){
-            $ip + "`t`t" + $hostname | Out-File -encoding ASCII -append $filename
+function BlockHost {
+    param(
+        [Parameter(
+            ValueFromPipeline=$False, 
+            ParameterSetName="params",
+            Position = 0
+        )]
+        [object]$params
+    )
+    if ( $params.file ) {
+        Foreach ($line in Get-Content $params.file ){ BlockHost -params @{host=$line} }
+    }
+    if ( $params.host ) {
+       Write-Host -NoNewline "`t$($params.host) : "
+       try {
+            if ( ! $(IsHostAlreadyBlocked $HOST_FILE $params.host) ){
+                $HOST_IP + "`t`t" + $params.host | Out-File -encoding ASCII -append $HOST_FILE
+            }
+            else {
+                Write-Host -ForegroundColor Yellow "already blocked "
+                return
+            }
         }
-        else {
-            Write-Host -ForegroundColor Yellow "already blocked "
+        catch {
+            Write-Host -ForegroundColor Red "error"
             return
         }
+        Write-Host -ForegroundColor Green "done"
     }
-    catch {
-        Write-Host -ForegroundColor Red "error"
-        return
-    }
-    Write-Host -ForegroundColor Green "done"
 }
 
-function is_host_present {
+function IsHostAlreadyBlocked {
     param([string]$filename, [string]$hostname)
     $c = Get-Content $filename
 
@@ -39,22 +50,29 @@ function is_host_present {
     return $false
 }
 
-function block_shitty_ip {
-    param($ip)
-    Write-Host -NoNewline "`t$ip : "
-    if ( Get-NetFirewallRule -Name Blacklist_$ip -ErrorAction SilentlyContinue) {
-       Write-Host -ForegroundColor Yellow "already blacklisted"
-       return
+function FwBlockOutputIP {
+    param(
+        [object]$params
+    )
+    if ( $params.file ) {
+        foreach ($line in Get-Content $params.file ){ FwBlockOutputIP @{"ip"="$line"} }
     }
-    else {
-        Try {
-            New-NetFirewallRule -Name Blacklist_$ip -DisplayName "BlackList $ip" -Protocol any -Enabled True -Profile Any -RemoteAddress $ip -Action Block | Out-Null
+    if ( $params.ip) {
+        Write-Host -NoNewline "`t$($params.ip) : "
+        if ( Get-NetFirewallRule -Name Blacklist_$($params.ip) -ErrorAction SilentlyContinue) {
+           Write-Host -ForegroundColor Yellow "already blacklisted"
+           return
         }
-        Catch {
-            Write-Host -ForegroundColor Red "error"
-            return
+        else {
+            Try {
+                New-NetFirewallRule -Name Blacklist_$($params.ip) -DisplayName "BlackList $($params.ip)" -Protocol any -Enabled True -Profile Any -RemoteAddress $params.ip -Action Block | Out-Null
+            }
+            Catch {
+                Write-Host -ForegroundColor Red "error"
+                return
+            }
+            Write-Host -ForegroundColor Green "done"
         }
-        Write-Host -ForegroundColor Green "done"
     }
 }
 
@@ -85,29 +103,30 @@ function remove_shitty_tasks () {
 #   path    : the complete path to reg key
 #   key     : key name
 #   value   : The value to write
-function modify_shitty_reg_value {
-    param([string]$path, [string]$key, [string]$value, [string]$type)
-    Write-Host -NoNewline "`t$key reg key to $value : "
-    if (!(Test-Path $path)){
-        Write-Host -NoNewline "creating path "
-        New-Item -Path $path -Force | Out-Null
+function AddRegKey {
+    param(
+        [Parameter(Mandatory=$false)]
+        [object]$params
+    )
+    Write-Host -NoNewline "`t$($params.key) reg key to $($params.value) : "
+    if ( -not $params.path -or -not $params.key -or -not $params.value ) {
+        Write-Host -ForegroundColor Red -NoNewline "Error in AddRegKey : no path, key or value"
+    }
+    if ( -not $params.type ){ $params.type="DWORD" }
+    if ( -not (Test-Path $params.path) ){
+        Write-Host -NoNewline "- creating path -"
+        New-Item -Path $params.path -Force | Out-Null
     }
-
     try {
-        if ($type) {
-            Set-ItemProperty -Path $path -Name $key -Value $value -Type $type -Force
-        }
-        else {
-            Set-ItemProperty -Path $path -Name $key -Value $value -Type Dword -Force
-        }
+        Set-ItemProperty -Path $params.path -Name $params.key -Value $params.value -Type $params.type -Force
     }
     catch [System.Security.SecurityException]{
         Write-Host -ForegroundColor Red "access denied"
         return
     }
     catch {
-        Write-Host -ForegroundColor Red "error"
-        Write-Host "`t$Error[0]"
+        Write-Host -NoNewLine -ForegroundColor Red "`tError`n`t"
+        write-Host -ForegroundColor DarkRed $Error[0].Exception.Message
         return
     }
     Write-host -ForegroundColor Green "done"
@@ -165,33 +184,90 @@ function disable_shitty_feature {
 
 # remove unwanted "Modern App"
 # Params
-#   $pkg   : Package (Object)
-function remove_shitty_modern_app {
-    param($pkg)
-	Write-Host -NoNewLine "`t$($pkg.Name) :"
-	try {
-		$pkg | Remove-AppxPackage
-	}
-	catch {
-	    Write-Host -ForegroundColor Red "error"
-        write-Host $Error[0]
-        return
-	}
-	Write-Host -ForegroundColor Green "done"
+# 
+function UninstallModernApp {
+    param(
+        [cmdletbinding(
+            DefaultParameterSetName='params'
+        )]
+        [Parameter(
+            ValueFromPipeline=$False, 
+            ParameterSetName="params",
+            Position = 0
+        )]
+        [object]$params,
+
+        [Parameter(
+            ValueFromPipeline=$True, 
+            ParameterSetName="pkg",
+            Position = 0
+        )]
+        [Object]$pkg
+    )
+    if ( $params.file ) {      
+        Get-AppxPackage -AllUsers | Where-Object { $_.name -in $(Get-Content $params.file) } | foreach {
+            $_ | UninstallModernApp
+        }
+    }
+    elseif ( $params.name ) {
+        $(Get-AppxPackage -AllUsers | Where-Object { $_.name -like "*$($params.name)*" } ) | UninstallModernApp
+    }
+    elseif ( $pkg ) {
+        try {
+            Write-Host -NoNewLine "`tUninstall $($pkg.Name) :"
+            $pkg | Remove-AppxPackage | Out-Null
+            Write-Host -ForegroundColor Green "done"
+        }
+	    catch {
+	        Write-Host -NoNewLine -ForegroundColor Red "`tError in UninstallModernApp`n`t"
+            write-Host -ForegroundColor DarkRed $Error[0].Exception.Message
+            return
+	    }
+    }
+    if ( $params.removeProvisionned ) {
+        UninstallModernProvisonnedApp $params
+    }
 }
 
-function remove_provisioned_shitty_modern_app {
-    param($pkg)
-	Write-Host -NoNewline "`t$($pkg.DisplayName) : "
-    try {
-		$pkg | Remove-AppxProvisionedPackage -Online | Out-Null
-	}
-	catch {
-		Write-Host -ForegroundColor red "error"
-        Write-Host $Error[0]
-		return
-	}
-	Write-Host -ForegroundColor Green "done"
+function UninstallModernProvisonnedApp {
+    param(
+        [cmdletbinding(
+            DefaultParameterSetName='params'
+        )]
+       [Parameter(
+            ValueFromPipeline=$False, 
+            #ParameterSetName="params",
+            Position = 0
+        )]
+        [object]$params,
+
+        [Parameter(
+            ValueFromPipeline=$True, 
+            ParameterSetName="pkg",
+            Position = 0
+        )]
+        [Object]$pkg
+    )
+    if ( $params.file ) {      
+        Get-AppxProvisionedPackage -Online | Where-Object { $_.DisplayName -in $(Get-Content $params.file) } | foreach { 
+            UninstallModernProvisonnedApp -pkg $_
+        }
+    }
+    elseif ( $params.name ) {
+        UninstallModernProvisonnedApp -pkg $(Get-AppxProvisionedPackage -Online | Where-Object { $_.DisplayName -like "*$($params.name)*" })
+    }
+    elseif ( $pkg ) {
+        try {
+            Write-Host -NoNewLine "`tUninstall Provisonned $($pkg.DisplayName) :"
+            $pkg | Remove-AppxProvisionedPackage -Online | Out-Null
+            Write-Host -ForegroundColor Green "done"
+        }
+	    catch {
+	        Write-Host -NoNewLine -ForegroundColor Red "`tError in UninstallModernApp`n`t"
+            write-Host -ForegroundColor DarkRed $Error[0].Exception.Message
+            return
+	    }
+    }
 }
 
 function disable_shitty_service {
@@ -230,128 +306,25 @@ function kill_shitty_process {
 Write-Output "`nI's time to kick ass and chew bubble gum"
 Write-Output "________________________________________`n"
 
-Write-Host -ForegroundColor White "Blacklist  hosts :"
-foreach ($line in Get-Content "lib\hosts.txt"){ block_shitty_host $HOST_FILE $HOST_IP $line }
-Write-Host -ForegroundColor White "`nBlacklist IPs :"
-foreach ($line in Get-Content "lib\ip.txt"){ block_shitty_ip $line }
-Write-Host -ForegroundColor White "`nDisable features :"
-foreach ($line in Get-Content "lib\features.txt"){ disable_shitty_feature $line }
-Write-Host -ForegroundColor White "`nDisable services :"
-foreach ($line in Get-Content "lib\services.txt") { disable_shitty_service $line }
-
-Write-Host -ForegroundColor White "`nRemove modern apps :"
-Get-AppxPackage -AllUsers | Where-Object { $_.name -in $(Get-Content "lib\apps.txt")} | foreach {
-    remove_shitty_modern_app $_
+Get-ChildItem -Path $PSScriptRoot"\modules.d" -Filter "*.conf" | foreach {
+    $module = ""
+    $module = Get-Content $_.FullName -Raw | ConvertFrom-Json
+  
+    Write-Host -ForegroundColor White "`nProcess Module $($module.name)"
+    $module_dir = $_.Directory.FullName + "\" + $_.BaseName + "\"
+    $module.actions | Foreach {
+        $action_file = ""
+        $current_action = $_
+        # If action content a file element, nedd to test if file exist
+        if ( $_.file) {
+             $action_file = $module_dir + $_.file
+            if ( -not (Test-Path $action_file) ) {
+                Write-Host -ForegroundColor Red "`tError in $($module.name) : file $($_.file) not found"
+                return
+            }
+            $_.file = $action_file
+        }
+        # Invoke function
+        Invoke-Expression "$($_.action) -params `$_"
+    }
 }
-
-Write-Host -ForegroundColor White "`nRemove provisioned modern apps :"
-Get-AppxProvisionedPackage -Online | Where-Object { $_.DisplayName -in $(Get-Content "lib\apps.txt")} | foreach {
-    remove_provisioned_shitty_modern_app $_
-}
-Write-Host -ForegroundColor White "`nRemove tasks :"
-foreach ($line in Get-Content "lib\tasks.txt") {remove_shitty_tasks $line }
-
-#Remove all OneDrive Stuff thanks to https://github.com/W4RH4WK/Debloat-Windows-10/
-Write-Host -ForegroundColor white "`nRemoving all Onedrive stuff :"
-
-# Kill onedrive qnd explorer for proper uninstallation
-kill_shitty_process "onedrive"
-kill_shitty_process "explorer"
-
-Write-Host "`tUninstalling Onedrive"
-if (Test-Path "$env:systemroot\System32\OneDriveSetup.exe") {
-    & "$env:systemroot\System32\OneDriveSetup.exe" /uninstall
-}
-if (Test-Path "$env:systemroot\SysWOW64\OneDriveSetup.exe") {
-    & "$env:systemroot\SysWOW64\OneDriveSetup.exe" /uninstall
-}
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue "$env:localappdata\Microsoft\OneDrive"
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue "$env:programdata\Microsoft OneDrive"
-Remove-Item -Recurse -Force -ErrorAction SilentlyContinue "$env:systemdrive\OneDriveTemp"
-
-Write-Host  "`tModify OneDrive shitty registery values :"
-#OneDrive
-modify_shitty_reg_value "HKLM:\Software\Policies\Microsoft\Windows\OneDrive" "DisableFileSyncNGSC" 1
-modify_shitty_reg_value "HKLM:\Software\Policies\Microsoft\Windows\OneDrive" "DisableFileSync" 1
-modify_shitty_reg_value "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\StartupApproved\Run"  "OneDrive" "0300000021B9DEB396D7D001" "Binary"
-# Onedrive Explorer integration
-New-PSDrive -PSProvider Registry -Root HKEY_CLASSES_ROOT -Name HKCR | Out-Null
-modify_shitty_reg_value "HKCR:\Wow6432Node\CLSID\{018D5C66-4533-4307-9B53-224DE2ED1FE6}" "System.IsPinnedToNameSpaceTree" 0
-modify_shitty_reg_value "HKCR:\CLSID\{018D5C66-4533-4307-9B53-224DE2ED1FE6}" "System.IsPinnedToNameSpaceTree" 0
-Remove-PSDrive -Name HKCR
-Get-ScheduledTask -TaskPath '\' -TaskName 'OneDrive*' -ea SilentlyContinue | foreach {
-    remove_shitty_tasks $_
-}
-
-reg load "hku\Default" "C:\Users\Default\NTUSER.DAT" | Out-Null
-New-PSDrive -PSProvider Registry -Root HKEY_USERS -Name HKU | Out-Null
-delete_shitty_reg_key "HKU:\Default\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" "OneDriveSetup"
-Remove-PSDrive -Name HKU
-reg unload "hku\Default" | Out-Null
-Start-Process "explorer.exe"
-
-#Advertiging...
-Write-Host -ForegroundColor White "`nDisable Advertising :"
-modify_shitty_reg_value "HKLM:\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\AdvertisingInfo" "Enabled" "0"
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AdvertisingInfo" "DisabledByGroupPolicy" 1
-
-# Geoloc.
-Write-Host -ForegroundColor White "`nDisable  Geolocalization :"
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\LocationAndSensors" "DisableLocation" 1
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\LocationAndSensors" "DisableLocationScripting" 1
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\LocationAndSensors" "DisableWindowsLocationProvider" 1
-
-#smartscreen filter
-Write-Host -ForegroundColor White "`nDisable Smartscreen filter :"
-modify_shitty_reg_value "HKCU:\SOFTWARE\Microsoft\Windows\CurrentVersion\AppHost" "EnableWebContentEvaluation"
-
-# AllowTelemetry
-Write-Host -ForegroundColor White "`nDisable Telemetry :"
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection" "AllowTelemetry" 0
-
-Write-Host -ForegroundColor White "`nModify somes Windows defendenr behaviors :"
-# Windows Defender Delivery Optimization Download
-modify_shitty_reg_value "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\DeliveryOptimization\Config" "DODownloadMode" "0"
-# Windows Defender Behavior monitoring and Spynet reporting.
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows Defender\Real-Time Protection" "DisableBehaviorMonitoring" 1
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows Defender\Spynet" "SpynetReporting" 0
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows Defender\Spynet" "SubmitSamplesConsent" 2
-
-
-Write-Host -ForegroundColor White "`nDisable Wifi-Sense :"
-# WifiSense Credential Share
-modify_shitty_reg_value  "HKLM:\SOFTWARE\Microsoft\WcmSvc\wifinetworkmanager\features" "WiFiSenseCredShared" "0"
-# WifiSense Open-ness
-modify_shitty_reg_value "HKLM:\SOFTWARE\Microsoft\WcmSvc\wifinetworkmanager\features" "WiFiSenseOpen" "0"
-
-
-# Disable Cortana
-Write-Host -ForegroundColor White "`nDisable Cortana (online at least) :"
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Windows Search\" "AllowCortana" "0"
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Windows Search\" "ConnectedSearchUseWeb" "0"
-
-# App right.
-Write-Host -ForegroundColor White "`nDisable rights for applications :"
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessAccountInfo" 2
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessCalendar" 2
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessCallHistory" 2
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessCamera" 2
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessContacts" 2
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessEmail" 2
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessLocation" 2
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessMessaging" 2
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessMicrophone" 2
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessMotion" 2
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessRadios" 2
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessTrustedDevices" 2
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsSyncWithDevices" 2
-
-# MS Account
-Write-Host -ForegroundColor White "`nDisable MS online account for login :"
-modify_shitty_reg_value "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System" "NoConnectedUser" 3
-
-# App suggestion (Cloud Content)
-Write-Host -ForegroundColor White "`nDisable suggestions :"
-modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\Cloud Content" "DisableWindowsConsumerFeatures" 1
-
-Write-Host "all done!"
diff --git a/modules.d/BlockHosts.conf b/modules.d/BlockHosts.conf
new file mode 100644
index 0000000..1909b97
--- /dev/null
+++ b/modules.d/BlockHosts.conf
@@ -0,0 +1,11 @@
+{
+	"name" : "Block unwanted Host",
+	"description" : "This module block some hosts from Microsoft",
+	"actions" : [
+		{
+			"action" : "BlockHost",
+			"file" : "hosts.txt",
+			"host" : ""
+		}
+	]
+}
\ No newline at end of file
diff --git a/modules.d/BlockHosts/hosts.txt b/modules.d/BlockHosts/hosts.txt
new file mode 100644
index 0000000..2008428
--- /dev/null
+++ b/modules.d/BlockHosts/hosts.txt
@@ -0,0 +1,130 @@
+184-86-53-99.deploy.static.akamaitechnologies.com
+a-0001.a-msedge.net
+a-0002.a-msedge.net
+a-0003.a-msedge.net
+a-0004.a-msedge.net
+a-0005.a-msedge.net
+a-0006.a-msedge.net
+a-0007.a-msedge.net
+a-0008.a-msedge.net
+a-0009.a-msedge.net
+a-msedge.net
+a.ads1.msn.com
+a.ads2.msads.net
+a.ads2.msn.com
+a.rad.msn.com
+a1621.g.akamai.net
+a1856.g2.akamai.net
+a1961.g.akamai.net
+a978.i6g1.akamai.net
+ac3.msn.com
+ad.doubleclick.net
+adnexus.net
+adnxs.com
+ads.msn.com
+ads1.msads.net
+ads1.msn.com
+aidps.atdmt.com
+aka-cdn-ns.adtech.de
+apps.skype.com
+az361816.vo.msecnd.net
+az512334.vo.msecnd.net
+b.ads1.msn.com
+b.ads2.msads.net
+b.rad.msn.com
+bingads.microsoft.com
+bs.serving-sys.com
+c.atdmt.com
+c.msn.com
+cdn.atdmt.com
+cds26.ams9.msecn.net
+choice.microsoft.com
+choice.microsoft.com.nsatc.net
+compatexchange.cloudapp.net
+corp.sts.microsoft.com
+corpext.msitadfs.glbdns2.microsoft.com
+cs1.wpc.v0cdn.net
+cy2.vortex.data.microsoft.com.akadns.net
+db3aqu.atdmt.com
+df.telemetry.microsoft.com
+diagnostics.support.microsoft.com
+e2835.dspb.akamaiedge.net
+e7341.g.akamaiedge.net
+e7502.ce.akamaiedge.net
+e8218.ce.akamaiedge.net
+ec.atdmt.com
+fe2.update.microsoft.com.akadns.net
+feedback.microsoft-hohm.com
+feedback.search.microsoft.com
+feedback.windows.com
+flex.msn.com
+g.msn.com
+h1.msn.com
+h2.msn.com
+hostedocsp.globalsign.com
+i1.services.social.microsoft.com
+i1.services.social.microsoft.com.nsatc.net
+ipv6.msftncsi.com
+ipv6.msftncsi.com.edgesuite.net
+lb1.www.ms.akadns.net
+live.rads.msn.com
+m.adnxs.com
+m.hotmail.com
+msedge.net
+msftncsi.com
+msnbot-65-55-108-23.search.msn.com
+msntest.serving-sys.com
+oca.telemetry.microsoft.com
+oca.telemetry.microsoft.com.nsatc.net
+pre.footprintpredict.com
+preview.msn.com
+pricelist.skype.com
+rad.live.com
+rad.msn.com
+redir.metaservices.microsoft.com
+reports.wes.df.telemetry.microsoft.com
+s.gateway.messenger.live.com
+s0.2mdn.net
+schemas.microsoft.akadns.net
+secure.adnxs.com
+secure.flashtalking.com
+services.wes.df.telemetry.microsoft.com
+settings-sandbox.data.microsoft.com
+settings-win.data.microsoft.com
+sls.update.microsoft.com.akadns.net
+sqm.df.telemetry.microsoft.com
+sqm.telemetry.microsoft.com
+sqm.telemetry.microsoft.com.nsatc.net
+ssw.live.com
+static.2mdn.net
+statsfe1.ws.microsoft.com
+statsfe2.update.microsoft.com.akadns.net
+statsfe2.ws.microsoft.com
+survey.watson.microsoft.com
+telecommand.telemetry.microsoft.com
+telecommand.telemetry.microsoft.com.nsatc.net
+telemetry.appex.bing.net
+telemetry.microsoft.com
+telemetry.urs.microsoft.com
+ui.skype.com
+v10.vortex-win.data.microsoft.com
+view.atdmt.com
+vortex-bn2.metron.live.com.nsatc.net
+vortex-cy2.metron.live.com.nsatc.net
+vortex-sandbox.data.microsoft.com
+vortex-win.data.metron.live.com.nsatc.net
+vortex-win.data.microsoft.com
+vortex.data.glbdns2.microsoft.com
+vortex.data.microsoft.com
+watson.live.com
+watson.microsoft.com
+watson.ppe.telemetry.microsoft.com
+watson.telemetry.microsoft.com
+watson.telemetry.microsoft.com.nsatc.net
+web.vortex.data.microsoft.com
+wes.df.telemetry.microsoft.com
+www.msftncsi.com
+win10.ipv6.microsoft.com
+www.bingads.microsoft.com
+www.go.microsoft.akadns.net
+www.msftncsi.com
diff --git a/modules.d/BlockIP.conf b/modules.d/BlockIP.conf
new file mode 100644
index 0000000..37328cd
--- /dev/null
+++ b/modules.d/BlockIP.conf
@@ -0,0 +1,12 @@
+{
+	"name" : "Block IP From MS servers",
+	"description" : "Disable Advertising",
+	"actions" : [
+		{
+			"action" : "FwBlockOutputIP",
+			"ip" : "",
+			"file" : "ip.txt"
+		}
+	]
+
+}
\ No newline at end of file
diff --git a/modules.d/BlockIP/ip.txt b/modules.d/BlockIP/ip.txt
new file mode 100644
index 0000000..c534941
--- /dev/null
+++ b/modules.d/BlockIP/ip.txt
@@ -0,0 +1,12 @@
+2.22.61.43
+2.22.61.66
+64.4.54.254
+65.39.117.230
+65.52.108.33
+65.55.108.23
+23.218.212.69
+134.170.30.202
+137.116.81.24
+157.56.106.189
+184.86.53.99
+204.79.197.200
\ No newline at end of file
diff --git a/modules.d/DelModernApp.conf b/modules.d/DelModernApp.conf
new file mode 100644
index 0000000..39ee397
--- /dev/null
+++ b/modules.d/DelModernApp.conf
@@ -0,0 +1,11 @@
+{
+	"name" : "Delete Metro App",
+	"description" : "This module delete all useless modern app",
+	"actions" : [
+		{
+			"action" : "UninstallModernApp",
+			"file" : "apps.txt",
+			"removeProvisionned" : "true"
+		}
+	]
+}
\ No newline at end of file
diff --git a/modules.d/DelModernApp/apps.txt b/modules.d/DelModernApp/apps.txt
new file mode 100644
index 0000000..d954926
--- /dev/null
+++ b/modules.d/DelModernApp/apps.txt
@@ -0,0 +1,49 @@
+Microsoft.3dbuilder
+Microsoft.Appconnector
+Microsoft.BingFinance
+Microsoft.BingFoodAndDrink
+Microsoft.BingHealthAndFitness
+Microsoft.BingNews
+Microsoft.BingSports
+Microsoft.BingTravel
+Microsoft.BingWeather
+Microsoft.CommsPhone
+Microsoft.ConnectivityStore
+Microsoft.Getstarted
+Microsoft.Messaging
+Microsoft.Microsoft3DViewer
+Microsoft.MicrosoftOfficeHub
+Microsoft.MicrosoftPowerBIForWindows
+Microsoft.MicrosoftSolitaireCollection
+Microsoft.MicrosoftStickyNotes
+Microsoft.MinecraftUWP
+Microsoft.MSPaint
+Microsoft.Office.OneNote
+Microsoft.Office.Sway
+Microsoft.OneConnect
+Microsoft.People
+Microsoft.Services.Store.Engagement
+Microsoft.SkypeApp
+Microsoft.Windows.Photos
+Microsoft.WindowsAlarms
+Microsoft.WindowsCalculator
+Microsoft.WindowsCamera
+microsoft.windowscommunicationsapps
+Microsoft.WindowsFeedbackHub
+Microsoft.WindowsMaps
+Microsoft.WindowsPhone
+Microsoft.WindowsSoundRecorder
+Microsoft.WindowsStore
+Microsoft.XboxApp
+Microsoft.ZuneMusic
+Microsoft.ZuneVideo
+Microsoft.Advertising.Xaml
+9E2F88E3.Twitter
+king.com.CandyCrushSodaSaga
+f5.vpn.client
+SonicWALL.MobileConnect
+Microsoft.BingMaps
+Microsoft.XboxLIVEGame
+Microsoft.Reader
+Microsoft.WindowsReadingList
+Microsoft.WindowsScan
\ No newline at end of file
diff --git a/modules.d/DisableAdvertising.conf b/modules.d/DisableAdvertising.conf
new file mode 100644
index 0000000..6cb4cef
--- /dev/null
+++ b/modules.d/DisableAdvertising.conf
@@ -0,0 +1,14 @@
+{
+	"name" : "Disable Advertising",
+	"description" : "Disable Advertising",
+	"actions" : [
+		{
+			"action" : "AddRegKey",
+			"value" : "1",
+			"key" : "DisabledByGroupPolicy",
+			"path" : "HKLM:\\SOFTWARE\\Policies\\Microsoft\\Windows\\AdvertisingInfo",
+			"type" : ""
+		}
+	]
+
+}
\ No newline at end of file