.travis.yml        | 2 +-
 Makefile           | 8 ++++----
 nnn.c => src/nnn.c | 0 
 nnn.h => src/nnn.h | 0 

diff --git a/.travis.yml b/.travis.yml
index 31c2dc02024010b6c17c6d6382af8a72d21dfa66..46b77741741c90f26118fcb8843282bbe7257192 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ script:
   - export CFLAGS=-Werror;
   - make clean; make;
   - make clean;
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$CC" == "clang" ]]; then clang-tidy *.h *.c -- -I/usr/include; fi; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then if [[ "$CC" == "clang" ]]; then clang-tidy src/* -- -I/usr/include; fi; fi
 
 before_deploy:
   - cd ..
diff --git a/Makefile b/Makefile
index 12769c613a8761c59cee0f1f7d3bb743005d0c12..4d705649d1a4f0bad72e340df9f2902f0c02b173 100644
--- a/Makefile
+++ b/Makefile
@@ -16,13 +16,13 @@ else
 	LDLIBS += -lncurses
 endif
 
-DISTFILES = nnn.c nnn.h nnn.1 Makefile README.md LICENSE
-SRC = nnn.c
+DISTFILES = src nnn.1 Makefile README.md LICENSE
+SRC = src/nnn.c
 BIN = nnn
 
 all: $(BIN)
 
-$(SRC): nnn.h
+$(SRC): src/nnn.h
 
 $(BIN): $(SRC)
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS)
@@ -45,7 +45,7 @@ 	$(STRIP) $^
 
 dist:
 	mkdir -p nnn-$(VERSION)
-	$(CP) $(DISTFILES) nnn-$(VERSION)
+	$(CP) -r $(DISTFILES) nnn-$(VERSION)
 	tar -cf nnn-$(VERSION).tar nnn-$(VERSION)
 	gzip nnn-$(VERSION).tar
 	$(RM) -r nnn-$(VERSION)
diff --git a/nnn.c b/src/nnn.c
rename from nnn.c
rename to src/nnn.c
diff --git a/nnn.h b/src/nnn.h
rename from nnn.h
rename to src/nnn.h