Re-arrange directory to resemble an actual module and fix parsing for DNRs from AuthServ