diff --git a/dnn/Makefile.am b/dnn/Makefile.am
index 8126391d..fb5e2200 100644
--- a/dnn/Makefile.am
+++ b/dnn/Makefile.am
@@ -14,8 +14,8 @@ noinst_HEADERS = arch.h  \
 		 kiss_fft.h  \
 		 opus_types.h  \
 		 pitch.h  \
-		 rnn_data.h  \
-		 rnn.h  \
+		 nnet_data.h  \
+		 nnet.h  \
 		 tansig_table.h
 
 liblpcnet_la_SOURCES = \
@@ -39,7 +39,7 @@ if OP_ENABLE_EXAMPLES
 noinst_PROGRAMS = lpcnet_demo
 endif
 
-src_lpcnet_demo_SOURCES = examples/lpcnet_demo.c
+src_lpcnet_demo_SOURCES = lpcnet_demo.c
 src_lpcnet_demo_LDADD = liblpcnet.la
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/dnn/configure.ac b/dnn/configure.ac
index ed623875..ec9808b2 100644
--- a/dnn/configure.ac
+++ b/dnn/configure.ac
@@ -13,7 +13,7 @@ m4_define([CURRENT_VERSION],
                        fi ]))
 
 AC_INIT([lpcnet],[CURRENT_VERSION],[jmvalin@jmvalin.ca])
-AC_CONFIG_SRCDIR([denoise.c])
+AC_CONFIG_SRCDIR([lpcnet.c])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_USE_SYSTEM_EXTENSIONS
diff --git a/dnn/lpcnet.h b/dnn/include/lpcnet.h
similarity index 100%
rename from dnn/lpcnet.h
rename to dnn/include/lpcnet.h