diff --git a/objs.mk b/objs.mk
index 523e074..548ca21 100644
--- a/objs.mk
+++ b/objs.mk
@@ -23,9 +23,15 @@ src/external_xemil_src_xinclude.o: external/xemil/src/xinclude.c
 OBJS += src/external_xemil_src_xpointer.o
 src/external_xemil_src_xpointer.o: external/xemil/src/xpointer.c
 	$(CC) $(CFLAGS) -c -o $@ external/xemil/src/xpointer.c
-OBJS += src/src_classic.o
-src/src_classic.o: src/classic.c
-	$(CC) $(CFLAGS) -c -o $@ src/classic.c
+OBJS += src/src_action_help.o
+src/src_action_help.o: src/action/help.c
+	$(CC) $(CFLAGS) -c -o $@ src/action/help.c
+OBJS += src/src_action_seed.o
+src/src_action_seed.o: src/action/seed.c
+	$(CC) $(CFLAGS) -c -o $@ src/action/seed.c
+OBJS += src/src_action_site.o
+src/src_action_site.o: src/action/site.c
+	$(CC) $(CFLAGS) -c -o $@ src/action/site.c
 OBJS += src/src_crc.o
 src/src_crc.o: src/crc.c
 	$(CC) $(CFLAGS) -c -o $@ src/crc.c
@@ -35,9 +41,6 @@ src/src_default.o: src/default.c
 OBJS += src/src_dirent.o
 src/src_dirent.o: src/dirent.c
 	$(CC) $(CFLAGS) -c -o $@ src/dirent.c
-OBJS += src/src_help.o
-src/src_help.o: src/help.c
-	$(CC) $(CFLAGS) -c -o $@ src/help.c
 OBJS += src/src_image_fill.o
 src/src_image_fill.o: src/image/fill.c
 	$(CC) $(CFLAGS) -c -o $@ src/image/fill.c
@@ -68,15 +71,12 @@ src/src_main.o: src/main.c
 OBJS += src/src_process.o
 src/src_process.o: src/process.c
 	$(CC) $(CFLAGS) -c -o $@ src/process.c
-OBJS += src/src_seed.o
-src/src_seed.o: src/seed.c
-	$(CC) $(CFLAGS) -c -o $@ src/seed.c
-OBJS += src/src_simple.o
-src/src_simple.o: src/simple.c
-	$(CC) $(CFLAGS) -c -o $@ src/simple.c
-OBJS += src/src_site.o
-src/src_site.o: src/site.c
-	$(CC) $(CFLAGS) -c -o $@ src/site.c
+OBJS += src/src_skin_classic.o
+src/src_skin_classic.o: src/skin/classic.c
+	$(CC) $(CFLAGS) -c -o $@ src/skin/classic.c
+OBJS += src/src_skin_simple.o
+src/src_skin_simple.o: src/skin/simple.c
+	$(CC) $(CFLAGS) -c -o $@ src/skin/simple.c
 OBJS += src/src_util.o
 src/src_util.o: src/util.c
 	$(CC) $(CFLAGS) -c -o $@ src/util.c
diff --git a/objs.sh b/objs.sh
index 43ce764..af5b5a4 100755
--- a/objs.sh
+++ b/objs.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 echo > objs.mk
-ls src/*.c src/image/*.c external/xemil/src/*.c external/md4c/src/md4c.c | while read a; do
+ls src/*.c src/action/*.c src/image/*.c src/skin/*.c external/xemil/src/*.c external/md4c/src/md4c.c | while read a; do
 	O="src/`echo "$a" | sed 's/.c$/.o/' | sed 's/\//_/g'`"
 	echo "OBJS += $O" >> objs.mk
 	echo "$O: $a" >> objs.mk
diff --git a/src/help.c b/src/action/help.c
similarity index 100%
rename from src/help.c
rename to src/action/help.c
diff --git a/src/seed.c b/src/action/seed.c
similarity index 100%
rename from src/seed.c
rename to src/action/seed.c
diff --git a/src/site.c b/src/action/site.c
similarity index 100%
rename from src/site.c
rename to src/action/site.c
diff --git a/src/classic.c b/src/skin/classic.c
similarity index 100%
rename from src/classic.c
rename to src/skin/classic.c
diff --git a/src/simple.c b/src/skin/simple.c
similarity index 100%
rename from src/simple.c
rename to src/skin/simple.c
diff --git a/src/taiga.h b/src/taiga.h
index 2b15b76..8033e8e 100644
--- a/src/taiga.h
+++ b/src/taiga.h
@@ -48,7 +48,7 @@ void		  io_closedir(IO_DIR* dir);
 #define io_closedir closedir
 #endif
 
-/* site.c */
+/* action/site.c */
 extern xemil_t* skinconf;
 extern void (*site_stylesheet)(FILE* out, const char* top); /* also create files here if you need one */
 extern void (*site_head)(FILE* out, const char* top, xl_node_t* header);
@@ -56,10 +56,10 @@ extern void (*site_body)(FILE* out, const char* top, const char* title, xl_node_
 
 int action_site(int argc, char** argv);
 
-/* help.c */
+/* action/help.c */
 int action_help(int argc, char** argv);
 
-/* seed.c */
+/* action/seed.c */
 int action_seed(int argc, char** argv);
 
 /* util.c */
@@ -87,12 +87,12 @@ void default_nav(FILE* out, const char* top, xl_node_t* element, int indent);
  * they're not documented... oh well
  */
 
-/* classic.c */
+/* skin/classic.c */
 void classic_stylesheet(FILE* out, const char* top);
 void classic_head(FILE* out, const char* top, xl_node_t* header);
 void classic_body(FILE* out, const char* top, const char* title, xl_node_t* body);
 
-/* simple.c */
+/* skin/simple.c */
 void simple_stylesheet(FILE* out, const char* top);
 void simple_head(FILE* out, const char* top, xl_node_t* header);
 void simple_body(FILE* out, const char* top, const char* title, xl_node_t* body);