Move sodium-specific files to a dedicated directory

configure.ac

@@ -2,7 +2,7 @@ AC_PREREQ([2.61])
 AC_INIT([libsodium],[0.4],[https://github.com/jedisct1/libsodium])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([libltdl/config])
-AC_CONFIG_SRCDIR([src/libsodium/version.c])
+AC_CONFIG_SRCDIR([src/libsodium/sodium/version.c])
 AC_CANONICAL_HOST
 AM_INIT_AUTOMAKE([1.11 dist-bzip2 tar-ustar])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

src/libsodium/Makefile.am

@@ -3,7 +3,6 @@ lib_LTLIBRARIES = \
 	libsodium.la
 
 libsodium_la_SOURCES = \
-	core.c \
 	crypto_core/hsalsa20/ref2/core_hsalsa20.c \
 	crypto_core/hsalsa20/ref2/crypto_core.h \
 	crypto_core/salsa20/ref/core_salsa20.c \
@@ -133,8 +132,9 @@ libsodium_la_SOURCES = \
 	randombytes/randombytes.c \
 	randombytes/salsa20/randombytes_salsa20_random.c \
 	randombytes/sysrandom/randombytes_sysrandom.c \
-	utils.c \
+	sodium/core.c \
-	version.c
+	sodium/utils.c \
+	sodium/version.c
 
 libsodium_la_LDFLAGS = \
 	$(AM_LDFLAGS) \