diff --git a/hosts b/hosts
index 21c2c61..aeb31a4 100644
--- a/hosts
+++ b/hosts
@@ -7,5 +7,5 @@ dell-laptop
 usb
 
 [miner]
-usb eth=true gpu=true amdgpu=true
-x570 eth=true gpu=true amdgpu=true ethminer=true
\ No newline at end of file
+usb amdgpu=true
+x570 eth=nanominer gpu=true amdgpu=true ethminer=true nanominer=true
\ No newline at end of file
diff --git a/local.yml b/local.yml
index e8b7592..32cb00a 100644
--- a/local.yml
+++ b/local.yml
@@ -81,8 +81,8 @@
   tasks:
     ### CPU SECTION ###
     # Monero #
-    - include: tasks/miner/cpu/xmr.yml
-      when: cpu is defined and xmr is defined
+    - include: tasks/miner/software/xmr-stak-cpu.yml
+      when: xmr_stak_cpu is defined
 
     ### GPU Section ###
     ## Drivers ##
@@ -90,8 +90,11 @@
       when: ansible_distribution == "Ubuntu" and amdgpu is defined
 
     # Ethereum #
-    - include: tasks/miner/gpu/ethminer.yml
-      when: gpu is defined and eth is defined
+    - include: tasks/miner/software/ethminer.yml
+      when: ethminer is defined
+
+    - include: tasks/miner/software/ethminer.yml
+      when: nanominer is defined
 
   # Scheduling
   post_tasks:
diff --git a/tasks/miner/scripts/mfn.yml b/tasks/miner/scripts/mfn.yml
new file mode 100644
index 0000000..da9ab23
--- /dev/null
+++ b/tasks/miner/scripts/mfn.yml
@@ -0,0 +1,24 @@
+---
+# Script to mine based on flags.
+
+- name: Miner | Scripts | Variables | Ethereum Pools
+  set_fact:
+    ## NanoPool ##
+    # Monero
+    xmr_nanopool1:
+    xmr_nanopool2:
+    xmr_nanopool3:
+    xmr_nanopool4:
+    xmr_nanopool5:
+    xmr_nanopool6:
+    xmr_nanopool7:
+    # Ethereum
+    eth_nanopool1:
+    eth_nanopool2:
+    eth_nanopool3:
+    eth_nanopool4:
+    eth_nanopool5:
+    eth_nanopool6:
+    eth_nanopool7:
+    ## Ethermine ##
+    # Ethereum
\ No newline at end of file
diff --git a/tasks/miner/gpu/ethminer.yml b/tasks/miner/software/ethminer.yml
similarity index 100%
rename from tasks/miner/gpu/ethminer.yml
rename to tasks/miner/software/ethminer.yml
diff --git a/tasks/miner/software/nanominer.yml b/tasks/miner/software/nanominer.yml
new file mode 100644
index 0000000..a32b7f6
--- /dev/null
+++ b/tasks/miner/software/nanominer.yml
@@ -0,0 +1,2 @@
+---
+# Nanominer from nanopool.org
diff --git a/tasks/miner/cpu/xmr.yml b/tasks/miner/software/xmr-stak-cpu.yml
similarity index 100%
rename from tasks/miner/cpu/xmr.yml
rename to tasks/miner/software/xmr-stak-cpu.yml