diff --git a/Makefile.am b/Makefile.am
index e16d81d..3f2a154 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ if USE_NLS
 po_SUBDIRS = po
 endif
 
-SUBDIRS = $(po_SUBDIRS) libx52 libx52util libx52io libusbx52 lib x52cli x52test utils daemon tests udev
+SUBDIRS = $(po_SUBDIRS) libx52 libx52util libx52io libusbx52 lib x52cli x52test evtest daemon tests udev
 
 # Extra files that need to be in the distribution
 EXTRA_DIST = \
diff --git a/configure.ac b/configure.ac
index 5ae55d9..fe8ab2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,10 +132,9 @@ AC_CONFIG_FILES([ po/Makefile.in
     lib/pinelog/Makefile
     udev/Makefile
     udev/60-saitek-x52-x52pro.rules
-    utils/Makefile
     x52cli/Makefile
     x52test/Makefile
-    utils/evtest/Makefile
+    evtest/Makefile
     daemon/Makefile
     tests/Makefile
 ])
diff --git a/utils/evtest/Makefile.am b/evtest/Makefile.am
similarity index 90%
rename from utils/evtest/Makefile.am
rename to evtest/Makefile.am
index dc62cbc..40df5ec 100644
--- a/utils/evtest/Makefile.am
+++ b/evtest/Makefile.am
@@ -12,4 +12,4 @@ bin_PROGRAMS = x52evtest
 x52evtest_SOURCES = ev_test.c
 x52evtest_CFLAGS = -I $(top_srcdir)/libx52io -I $(top_srcdir) -DLOCALEDIR=\"$(localedir)\" $(WARN_CFLAGS)
 x52evtest_LDFLAGS = $(WARN_LDFLAGS)
-x52evtest_LDADD = ../../libx52io/libx52io.la
+x52evtest_LDADD = ../libx52io/libx52io.la
diff --git a/utils/evtest/ev_test.c b/evtest/ev_test.c
similarity index 100%
rename from utils/evtest/ev_test.c
rename to evtest/ev_test.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6b4d5cc..9bab045 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,7 @@ libx52/x52_stringify.c
 
 libx52io/io_strings.c
 
-utils/evtest/ev_test.c
+evtest/ev_test.c
 
 x52test/x52_test.c
 x52test/x52_test_clock.c
diff --git a/po/x52pro-linux.pot b/po/x52pro-linux.pot
index 86d4b23..208fccf 100644
--- a/po/x52pro-linux.pot
+++ b/po/x52pro-linux.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: x52pro-linux 0.2.2\n"
 "Report-Msgid-Bugs-To: https://github.com/nirenjan/x52pro-linux/issues\n"
-"POT-Creation-Date: 2021-07-29 22:12-0700\n"
+"POT-Creation-Date: 2021-07-29 22:25-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -231,26 +231,26 @@ msgstr ""
 msgid "Read timeout"
 msgstr ""
 
-#: utils/evtest/ev_test.c:109
+#: evtest/ev_test.c:109
 #, c-format
 msgid "Device ID: vendor 0x%04x product 0x%04x version 0x%04x\n"
 msgstr ""
 
-#: utils/evtest/ev_test.c:113
+#: evtest/ev_test.c:113
 #, c-format
 msgid "Device name: \"%s %s\"\n"
 msgstr ""
 
-#: utils/evtest/ev_test.c:116
+#: evtest/ev_test.c:116
 #, c-format
 msgid "Serial number: \"%s\"\n"
 msgstr ""
 
-#: utils/evtest/ev_test.c:117
+#: evtest/ev_test.c:117
 msgid "Testing (interrupt to exit)\n"
 msgstr ""
 
-#: utils/evtest/ev_test.c:157 utils/evtest/ev_test.c:165
+#: evtest/ev_test.c:157 evtest/ev_test.c:165
 #, c-format
 msgid "Event @ %ld.%06ld: %s, value %d\n"
 msgstr ""
diff --git a/po/xx_PL.po b/po/xx_PL.po
index 714021a..1b21b52 100644
--- a/po/xx_PL.po
+++ b/po/xx_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: x52pro-linux 0.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/nirenjan/x52pro-linux/issues\n"
-"POT-Creation-Date: 2021-07-29 22:12-0700\n"
+"POT-Creation-Date: 2021-07-29 22:25-0700\n"
 "PO-Revision-Date: 2021-07-27 02:08-0700\n"
 "Last-Translator: Nirenjan Krishnan <nirenjan@gmail.com>\n"
 "Language-Team: Dummy Language for testing i18n\n"
@@ -231,26 +231,26 @@ msgstr "I/O erroray"
 msgid "Read timeout"
 msgstr "Eadray imeouttay"
 
-#: utils/evtest/ev_test.c:109
+#: evtest/ev_test.c:109
 #, c-format
 msgid "Device ID: vendor 0x%04x product 0x%04x version 0x%04x\n"
 msgstr "Eviceday IDay: endorvay 0x%04x oductpray 0x%04x ersionvay 0x%04x\n"
 
-#: utils/evtest/ev_test.c:113
+#: evtest/ev_test.c:113
 #, c-format
 msgid "Device name: \"%s %s\"\n"
 msgstr "Eviceday amenay: \"%s %s\"\n"
 
-#: utils/evtest/ev_test.c:116
+#: evtest/ev_test.c:116
 #, c-format
 msgid "Serial number: \"%s\"\n"
 msgstr "Erialsay umbernay: \"%s\"\n"
 
-#: utils/evtest/ev_test.c:117
+#: evtest/ev_test.c:117
 msgid "Testing (interrupt to exit)\n"
 msgstr "Estingtay (interruptay otay exitay)\n"
 
-#: utils/evtest/ev_test.c:157 utils/evtest/ev_test.c:165
+#: evtest/ev_test.c:157 evtest/ev_test.c:165
 #, c-format
 msgid "Event @ %ld.%06ld: %s, value %d\n"
 msgstr "Eventay @ %ld.%06ld: %s, aluevay %d\n"
diff --git a/utils/Makefile.am b/utils/Makefile.am
deleted file mode 100644
index 50202dc..0000000
--- a/utils/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-# Top level Automake for utilities
-#
-# Copyright (C) 2012-2018 Nirenjan Krishnan (nirenjan@nirenjan.org)
-#
-# SPDX-License-Identifier: GPL-2.0-only WITH Classpath-exception-2.0
-
-SUBDIRS = evtest
-