diff --git a/roles/omnetpp/tasks/main_win.yml b/roles/omnetpp/tasks/main_win.yml
index 833b000..d17b337 100644
--- a/roles/omnetpp/tasks/main_win.yml
+++ b/roles/omnetpp/tasks/main_win.yml
@@ -3,7 +3,7 @@
 - name: Set OMNet++ version
   set_fact:
     target_version: "6.2.0"
-    target_dir: "C:\\OMNeT++"
+    target_dir: "{{large_prog_dir}}\\OMNeT++"
 
 - name: Check OMNet++ install status
   win_stat:
@@ -15,17 +15,23 @@
     - name: Download OMNet++
       win_get_url:
         url: "https://github.com/omnetpp/omnetpp/releases/download/omnetpp-{{ target_version }}/omnetpp-{{ target_version }}-windows-x86_64.7z"
-        dest: C:\
+        dest: "{{ large_prog_dir }}"
       register: download
 
     - name: Unzip OMNet++
       win_unzip:
         src: "{{ download.dest }}"
-        dest: C:\
+        dest: "{{ large_prog_dir }}"
         delete_archive: yes
 
     - name: Move OMNet++ to final location
-      win_command: cmd.exe /c move "C:\omnetpp-{{ target_version }}" "{{ target_dir }}"
+      ansible.windows.win_powershell: 
+        script: move "{{ large_prog_dir }}\omnetpp-{{ target_version }}" "{{ target_dir }}"
+      # win_robocopy: 
+      #  src: "{{ large_prog_dir }}\\omnetpp-{{ target_version }}"
+      #  dest: "{{ target_dir }}"
+      #  flags: "/move"
+      # win_command: cmd.exe /c move "c:\omnetpp-{{ target_version }}" "{{ target_dir }}"
 
     - name: Create OMNet++ compile script
       win_copy:
@@ -40,7 +46,7 @@
         line: call "%HOME%\\tools\\win32.x86_64\\msys2_shell.cmd" -mingw64 -c "./configure && make -j4" & exit
 
     - name: Compile OMNet++
-      win_command: cmd.exe /c "{{ target_dir }}\\mingwenv-install.cmd"
+      win_command: cmd.exe /c "{{ target_dir }}\mingwenv-install.cmd"
 
     - name: Copy OMNet++ shortcut
       win_copy: