diff --git a/Makefile.am b/Makefile.am
index a4e8dd3..3f6bd7f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
-
-bin_PROGRAMS = recoverjpeg recovermov
-dist_bin_SCRIPTS = sort-pictures remove-duplicates
-
-dist_man_MANS = recoverjpeg.1 recovermov.1 sort-pictures.1 remove-duplicates.1
+SUBDIRS = src doc scripts
 
 extra_DIST = ChangeLog
 
@@ -11,9 +7,3 @@ always::
 
 ChangeLog: always
 	git2cl > ChangeLog
-
-recoverjpeg_SOURCES = recoverjpeg.c utils.c utils.h
-recovermov_SOURCES = recovermov.cpp utils.c utils.h
-
-.md.1:
-	pandoc -s -w man $< -o $@
diff --git a/configure.ac b/configure.ac
index 0eabb08..f035239 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 AC_INIT([recoverjpeg], [2.6])
-AC_CONFIG_SRCDIR([recoverjpeg.c])
+AC_CONFIG_SRCDIR([src/recoverjpeg.c])
 AM_INIT_AUTOMAKE
 AC_CONFIG_HEADER([config.h])
 AC_PROG_CC
 AC_PROG_CXX
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile scripts/Makefile doc/Makefile])
 AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..9e85b36
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,4 @@
+dist_man_MANS = recoverjpeg.1 recovermov.1 sort-pictures.1 remove-duplicates.1
+
+.md.1:
+	pandoc -s -w man $< -o $@
diff --git a/README.md b/doc/README.md
similarity index 100%
rename from README.md
rename to doc/README.md
diff --git a/recoverjpeg.md b/doc/recoverjpeg.md
similarity index 100%
rename from recoverjpeg.md
rename to doc/recoverjpeg.md
diff --git a/recovermov.md b/doc/recovermov.md
similarity index 100%
rename from recovermov.md
rename to doc/recovermov.md
diff --git a/remove-duplicates.md b/doc/remove-duplicates.md
similarity index 100%
rename from remove-duplicates.md
rename to doc/remove-duplicates.md
diff --git a/sort-pictures.md b/doc/sort-pictures.md
similarity index 100%
rename from sort-pictures.md
rename to doc/sort-pictures.md
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
new file mode 100644
index 0000000..1d59b64
--- /dev/null
+++ b/scripts/Makefile.am
@@ -0,0 +1 @@
+dist_bin_SCRIPTS = sort-pictures remove-duplicates
diff --git a/remove-duplicates b/scripts/remove-duplicates
similarity index 100%
rename from remove-duplicates
rename to scripts/remove-duplicates
diff --git a/sort-pictures b/scripts/sort-pictures
similarity index 100%
rename from sort-pictures
rename to scripts/sort-pictures
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..4707830
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,4 @@
+bin_PROGRAMS = recoverjpeg recovermov
+
+recoverjpeg_SOURCES = recoverjpeg.c utils.c utils.h
+recovermov_SOURCES = recovermov.cpp utils.c utils.h
diff --git a/recoverjpeg.c b/src/recoverjpeg.c
similarity index 100%
rename from recoverjpeg.c
rename to src/recoverjpeg.c
diff --git a/recovermov.cpp b/src/recovermov.cpp
similarity index 100%
rename from recovermov.cpp
rename to src/recovermov.cpp
diff --git a/utils.c b/src/utils.c
similarity index 100%
rename from utils.c
rename to src/utils.c
diff --git a/utils.h b/src/utils.h
similarity index 100%
rename from utils.h
rename to src/utils.h