diff --git a/arch_sway.yml b/arch_sway.yml
index ed038b2..1496afa 100644
--- a/arch_sway.yml
+++ b/arch_sway.yml
@@ -4,80 +4,12 @@
   become: yes
   
   pre_tasks:
-    - name: Run the equivalent of "pacman -Syu" as a separate step
-      community.general.pacman:
-        update_cache: yes
-        upgrade: yes
-    - name: Install packages
-      community.general.pacman:
-        name: sudo,htop,base-devel,git
-        state: present
-    - name: Make sure we have a 'wheel' group
-      group:
-        name: wheel
-        state: present
-    - name: Allow 'wheel' group to have passwordless sudo
-      lineinfile:
-        dest: /etc/sudoers
-        state: present
-        regexp: '^%wheel'
-        line: '%wheel ALL=(ALL) NOPASSWD: ALL'
-    - name: Add the user tobi
-      ansible.builtin.user:
-        name: tobi
-        password: $6$jUZIIwoMDSg8B3OJ$tRKNJe.YHLVQRkbRSvmPJqE4lFUBVKKDxy.K688SW.gUP8VdfrkUeIIa7XqI8ovpncoZlt5VbGk7WxMKBCS191
-        comment: Tobias Maier
-        groups: wheel,video
-        shell: /bin/zsh
-    - name: Add name to git config
-      community.general.git_config:
-        name: user.name
-        scope: global
-        value: Tobias Maier
-    - name: Add email to git config
-      community.general.git_config:
-        name: user.email
-        scope: global
-        value: git@maiertobi.de
-    - name: Create the `aur_builder` user
-      ansible.builtin.user:
-        name: aur_builder
-        create_home: yes
-        group: wheel
-    - name: Allow the `aur_builder` user to run `sudo pacman` without a password
-      ansible.builtin.lineinfile:
-        path: /etc/sudoers.d/11-install-aur_builder
-        line: 'aur_builder ALL=(ALL) NOPASSWD: /usr/bin/pacman'
-        create: yes
-        validate: 'visudo -cf %s'
-        
-    - name: Add number of CPUs to MAKEPKG
-      ansible.builtin.lineinfile:
-        path: /etc/makepkg.conf
-        line: 'MAKEFLAGS="-j$(nproc)"'
-        create: yes
-    - name: Install paru using makepkg if it isn't installed already
-      kewlfft.aur.aur:
-        name: paru
-        use: makepkg
-        state: present
-      become: yes
-      become_user: aur_builder
-    - name: Install ZSH-GIT and reflector from AUR
-      community.general.pacman:
-        name: reflector
-        state: present
-        executable: paru
-      become: yes
-      become_user: aur_builder
-      
-    - name: Run reflector to update mirrorlist
-      ansible.builtin.command: reflector --latest 20 --sort rate --save /etc/pacman.d/mirrorlist
-
+    - name: Install Base stuff
+      import_tasks: modules/base.yml
     - name: Install packages from AUR
       kewlfft.aur.aur:
         use: paru
-        name: zsh,oh-my-zsh-git,zsh-theme-powerlevel10k-git,zsh-autosuggestions,zsh-syntax-highlighting,nano,ly,ansible,openssh,sway,foot,foot-terminfo,waybar,ttf-font-awesome,sway-launcher-desktop,pipewire,pipewire-pulse,bluez,bluez-utils,firefox,archlinux-wallpaper,iwd,btop,light,wob,udiskie,ranger,mako,micro,man,wdisplays,swayidle,swaylock-effects-git,pamixer,qt5-wayland
+        name: ly,openssh,sway,foot,foot-terminfo,waybar,ttf-font-awesome,sway-launcher-desktop,pipewire,pipewire-pulse,bluez,bluez-utils,firefox,archlinux-wallpaper,iwd,btop,light,wob,udiskie,ranger,mako,micro,man,wdisplays,swayidle,swaylock-effects-git,pamixer,qt5-wayland
         state: latest
       become: yes
       become_user: aur_builder
@@ -106,15 +38,6 @@
         - .config/waybar
         - .config/mako
         - git
-    - name: Copy ZSH dotfiles
-      copy: 
-        src: //home/tobi/git/dotfiles/{{ item.src }} 
-        dest: /home/tobi/{{ item.dest }}
-        remote_src: yes
-      with_items:
-      - { src: '.zshrc', dest: '.zshrc' }
-      - { src: '.p10k.zsh', dest: '.p10k.zsh' }
-        
         
     - name: Copy config files
       copy: 
@@ -145,8 +68,4 @@
         state: latest
         use: paru
       become: yes
-      become_user: aur_builder
-    
-    - name: reboot
-      reboot:
-
+      become_user: aur_builder
\ No newline at end of file
diff --git a/modules/paru.yml b/modules/paru.yml
index 66c18e6..33f069f 100644
--- a/modules/paru.yml
+++ b/modules/paru.yml
@@ -23,4 +23,15 @@
   ansible.builtin.lineinfile:
     path: /etc/makepkg.conf
     line: 'MAKEFLAGS="-j$(nproc)"'
-    create: yes
\ No newline at end of file
+    create: yes
+
+- name: Install Basic programs
+  kewlfft.aur.aur:
+    use: paru
+    name: reflector
+    state: latest
+  become: yes
+  become_user: aur_builder
+
+- name: Run reflector to update mirrorlist
+  ansible.builtin.command: reflector --latest 20 --sort rate --save /etc/pacman.d/mirrorlist
\ No newline at end of file