Once again mirroring the NixOS module changes that I forgot to port over.
This mirrors the changes made to the NixOS module.
Consolidating all modules under the same path, to clear out the top-level directory.