diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ba37af..aab9526 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [Unreleased][] - 2021-10-22
+
+- Fixed stopping at boot when GNOME starts location service (#21)
+
 ## [v0.5.0][] - 2021-10-10
 
 - Better error messages
diff --git a/README.md b/README.md
index a784eb8..624503c 100644
--- a/README.md
+++ b/README.md
@@ -219,13 +219,6 @@ sudo systemctl enable naxalnet.service
 
 Now naxalnet will start a mesh on every boot.
 
-If you use GNOME, you should mask `wpa_supplicant.service` so that it
-cannot be started by systemd. See issue #21
-
-```sh
-sudo systemctl mask wpa_supplicant.service
-```
-
 If you have NetworkManager enabled, which is the default in Ubuntu and
 Fedora, it should be disabled:
 
@@ -297,7 +290,7 @@ You can use the ap for connecting mobile phones and other devices
 to the mesh network.
 
 Read the code and the documentation in the code to learn the details.
-See the directory [systemd-networkd](systemd-networkd) to see how
+See the directory [network](network) to see how
 systemd-networkd configures the network.
 
 ## Use cases
diff --git a/naxalnet/__init__.py b/naxalnet/__init__.py
index 094ce96..2cce3c2 100644
--- a/naxalnet/__init__.py
+++ b/naxalnet/__init__.py
@@ -42,4 +42,4 @@ given below.
 #
 # In case you forgot to change the version, skip the number
 # and put the next number in the next commit.
-__version__ = "0.5.0"
+__version__ = "0.5.0a2"
diff --git a/systemd-networkd/mesh.01-batman.netdev b/network/mesh.01-batman.netdev
similarity index 100%
rename from systemd-networkd/mesh.01-batman.netdev
rename to network/mesh.01-batman.netdev
diff --git a/systemd-networkd/mesh.02-bridge.netdev b/network/mesh.02-bridge.netdev
similarity index 100%
rename from systemd-networkd/mesh.02-bridge.netdev
rename to network/mesh.02-bridge.netdev
diff --git a/systemd-networkd/mesh.03-wireless-ad-hoc.network b/network/mesh.03-wireless-ad-hoc.network
similarity index 100%
rename from systemd-networkd/mesh.03-wireless-ad-hoc.network
rename to network/mesh.03-wireless-ad-hoc.network
diff --git a/systemd-networkd/mesh.04-batman.network b/network/mesh.04-batman.network
similarity index 100%
rename from systemd-networkd/mesh.04-batman.network
rename to network/mesh.04-batman.network
diff --git a/systemd-networkd/mesh.05-wireless-ap.network b/network/mesh.05-wireless-ap.network
similarity index 100%
rename from systemd-networkd/mesh.05-wireless-ap.network
rename to network/mesh.05-wireless-ap.network
diff --git a/systemd-networkd/mesh.06-eth.network b/network/mesh.06-eth.network
similarity index 100%
rename from systemd-networkd/mesh.06-eth.network
rename to network/mesh.06-eth.network
diff --git a/systemd-networkd/mesh.07-bridge.network b/network/mesh.07-bridge.network
similarity index 100%
rename from systemd-networkd/mesh.07-bridge.network
rename to network/mesh.07-bridge.network
diff --git a/systemd-networkd/tmp.01-eth.network b/network/tmp.01-eth.network
similarity index 100%
rename from systemd-networkd/tmp.01-eth.network
rename to network/tmp.01-eth.network
diff --git a/naxalnet.service b/service/naxalnet.service
similarity index 85%
rename from naxalnet.service
rename to service/naxalnet.service
index 2760618..f8969e2 100644
--- a/naxalnet.service
+++ b/service/naxalnet.service
@@ -9,12 +9,10 @@ Wants=systemd-resolved.service
 After=iwd.service
 After=systemd-networkd.service
 After=systemd-resolved.service
-# Stops NetworkManager and wpa_supplicant if already running
+# Stops NetworkManager if already running
 Conflicts=NetworkManager.service
-Conflicts=wpa_supplicant.service
 # This stops networkmanager and wpa_supplicant when naxalnet is enabled
 After=NetworkManager.service
-After=wpa_supplicant.service
 
 [Service]
 Type=notify
diff --git a/setup.cfg b/setup.cfg
index 28a8a15..10e5e2f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,17 +33,17 @@ console_scripts =
 
 [options.data_files]
 lib/systemd/system =
-    naxalnet.service
+    service/naxalnet.service
 # If installing with pip, this file will be copied to some other place.
 # This is the reason we use setup.py instead of pip in the Makefile.
 /etc/naxalnet =
     naxalnet.conf.example
 share/naxalnet/networkd =
-    systemd-networkd/mesh.01-batman.netdev
-    systemd-networkd/mesh.02-bridge.netdev
-    systemd-networkd/mesh.03-wireless-ad-hoc.network
-    systemd-networkd/mesh.04-batman.network
-    systemd-networkd/mesh.05-wireless-ap.network
-    systemd-networkd/mesh.06-eth.network
-    systemd-networkd/mesh.07-bridge.network
-    systemd-networkd/tmp.01-eth.network
+    network/mesh.01-batman.netdev
+    network/mesh.02-bridge.netdev
+    network/mesh.03-wireless-ad-hoc.network
+    network/mesh.04-batman.network
+    network/mesh.05-wireless-ap.network
+    network/mesh.06-eth.network
+    network/mesh.07-bridge.network
+    network/tmp.01-eth.network