diff --git a/qualif/A-large.in b/2010-0-Qualif/A-snapper-chain-large.in
similarity index 100%
rename from qualif/A-large.in
rename to 2010-0-Qualif/A-snapper-chain-large.in
diff --git a/qualif/A-small-attempt0.in b/2010-0-Qualif/A-snapper-chain-small-attempt0.in
similarity index 100%
rename from qualif/A-small-attempt0.in
rename to 2010-0-Qualif/A-snapper-chain-small-attempt0.in
diff --git a/qualif/snapper1.pl b/2010-0-Qualif/A-snapper-chain1.pl
similarity index 100%
rename from qualif/snapper1.pl
rename to 2010-0-Qualif/A-snapper-chain1.pl
diff --git a/qualif/snapper2.S b/2010-0-Qualif/A-snapper-chain2.S
similarity index 100%
rename from qualif/snapper2.S
rename to 2010-0-Qualif/A-snapper-chain2.S
diff --git a/qualif/snapper2.bc b/2010-0-Qualif/A-snapper-chain2.bc
similarity index 100%
rename from qualif/snapper2.bc
rename to 2010-0-Qualif/A-snapper-chain2.bc
diff --git a/qualif/snapper2.pl b/2010-0-Qualif/A-snapper-chain2.pl
similarity index 100%
rename from qualif/snapper2.pl
rename to 2010-0-Qualif/A-snapper-chain2.pl
diff --git a/qualif/B-large.in b/2010-0-Qualif/B-fair-warning-large.in
similarity index 100%
rename from qualif/B-large.in
rename to 2010-0-Qualif/B-fair-warning-large.in
diff --git a/qualif/B-small-attempt0.in b/2010-0-Qualif/B-fair-warning-small-attempt0.in
similarity index 100%
rename from qualif/B-small-attempt0.in
rename to 2010-0-Qualif/B-fair-warning-small-attempt0.in
diff --git a/qualif/warning.lisp b/2010-0-Qualif/B-fair-warning.lisp
similarity index 100%
rename from qualif/warning.lisp
rename to 2010-0-Qualif/B-fair-warning.lisp
diff --git a/qualif/C-large.in b/2010-0-Qualif/C-theme-park-large.in
similarity index 100%
rename from qualif/C-large.in
rename to 2010-0-Qualif/C-theme-park-large.in
diff --git a/qualif/C-small-attempt0.in b/2010-0-Qualif/C-theme-park-small-attempt0.in
similarity index 100%
rename from qualif/C-small-attempt0.in
rename to 2010-0-Qualif/C-theme-park-small-attempt0.in
diff --git a/qualif/park.hs b/2010-0-Qualif/C-theme-park.hs
similarity index 100%
rename from qualif/park.hs
rename to 2010-0-Qualif/C-theme-park.hs
diff --git a/2010-0-Qualif/Makefile b/2010-0-Qualif/Makefile
new file mode 100644
index 0000000..7d86d92
--- /dev/null
+++ b/2010-0-Qualif/Makefile
@@ -0,0 +1,5 @@
+A-snapper-chain2: A-snapper-chain2.o
+	ld -s -o $@ $^
+
+A-snapper-chain2.o: A-snapper-chain2.S
+	as -o $@ $<
diff --git a/qualif/exp.pl b/2010-0-Qualif/exp.pl
similarity index 100%
rename from qualif/exp.pl
rename to 2010-0-Qualif/exp.pl
diff --git a/round_1A/rotate-large.in b/2010-1A/A-rotate-large.in
similarity index 100%
rename from round_1A/rotate-large.in
rename to 2010-1A/A-rotate-large.in
diff --git a/round_1A/rotate-small-attempt0.in b/2010-1A/A-rotate-small-attempt0.in
similarity index 100%
rename from round_1A/rotate-small-attempt0.in
rename to 2010-1A/A-rotate-small-attempt0.in
diff --git a/round_1A/rotate.hs b/2010-1A/A-rotate.hs
similarity index 100%
rename from round_1A/rotate.hs
rename to 2010-1A/A-rotate.hs
diff --git a/round_1A/smooth.hs b/2010-1A/B-make-it-smooth.hs
similarity index 100%
rename from round_1A/smooth.hs
rename to 2010-1A/B-make-it-smooth.hs
diff --git a/round_1A/number.hs b/2010-1A/C-number-game.hs
similarity index 100%
rename from round_1A/number.hs
rename to 2010-1A/C-number-game.hs
diff --git a/round_1B/file-large.in b/2010-1B/A-file-fix-it-large.in
similarity index 100%
rename from round_1B/file-large.in
rename to 2010-1B/A-file-fix-it-large.in
diff --git a/round_1B/file-small-attempt0.in b/2010-1B/A-file-fix-it-small-attempt0.in
similarity index 100%
rename from round_1B/file-small-attempt0.in
rename to 2010-1B/A-file-fix-it-small-attempt0.in
diff --git a/round_1B/file.pl b/2010-1B/A-file-fix-it.pl
similarity index 100%
rename from round_1B/file.pl
rename to 2010-1B/A-file-fix-it.pl
diff --git a/round_1B/chicks-large.in b/2010-1B/B-picking-up-chicks-large.in
similarity index 100%
rename from round_1B/chicks-large.in
rename to 2010-1B/B-picking-up-chicks-large.in
diff --git a/round_1B/chicks-small-attempt0.in b/2010-1B/B-picking-up-chicks-small-attempt0.in
similarity index 100%
rename from round_1B/chicks-small-attempt0.in
rename to 2010-1B/B-picking-up-chicks-small-attempt0.in
diff --git a/round_1B/chicks.hs b/2010-1B/B-picking-up-chicks.hs
similarity index 100%
rename from round_1B/chicks.hs
rename to 2010-1B/B-picking-up-chicks.hs
diff --git a/round_1B/rank-large.in b/2010-1B/C-your-rank-is-pure-large.in
similarity index 100%
rename from round_1B/rank-large.in
rename to 2010-1B/C-your-rank-is-pure-large.in
diff --git a/round_1B/rank-small-attempt0.in b/2010-1B/C-your-rank-is-pure-small-attempt0.in
similarity index 100%
rename from round_1B/rank-small-attempt0.in
rename to 2010-1B/C-your-rank-is-pure-small-attempt0.in
diff --git a/round_1B/rank.cc b/2010-1B/C-your-rank-is-pure.cc
similarity index 100%
rename from round_1B/rank.cc
rename to 2010-1B/C-your-rank-is-pure.cc
diff --git a/round_1B/rank.hs b/2010-1B/C-your-rank-is-pure.hs
similarity index 100%
rename from round_1B/rank.hs
rename to 2010-1B/C-your-rank-is-pure.hs
diff --git a/round_1C/rope.hs b/2010-1C/A-rope-intranet.hs
similarity index 100%
rename from round_1C/rope.hs
rename to 2010-1C/A-rope-intranet.hs
diff --git a/round_1C/load.hs b/2010-1C/B-load-testing.hs
similarity index 100%
rename from round_1C/load.hs
rename to 2010-1C/B-load-testing.hs
diff --git a/round_1C/chess.hs b/2010-1C/C-making-chess-boards.hs
similarity index 100%
rename from round_1C/chess.hs
rename to 2010-1C/C-making-chess-boards.hs
diff --git a/round_2/diamond-large.in b/2010-2/A-elegant-diamond-large.in
similarity index 100%
rename from round_2/diamond-large.in
rename to 2010-2/A-elegant-diamond-large.in
diff --git a/round_2/diamond-small-attempt0.in b/2010-2/A-elegant-diamond-small-attempt0.in
similarity index 100%
rename from round_2/diamond-small-attempt0.in
rename to 2010-2/A-elegant-diamond-small-attempt0.in
diff --git a/round_2/diamond.hs b/2010-2/A-elegant-diamond.hs
similarity index 100%
rename from round_2/diamond.hs
rename to 2010-2/A-elegant-diamond.hs
diff --git a/round_2/football-large.hs b/2010-2/B-world-cup-2010-large.hs
similarity index 100%
rename from round_2/football-large.hs
rename to 2010-2/B-world-cup-2010-large.hs
diff --git a/round_2/football-small-attempt0.in b/2010-2/B-world-cup-2010-small-attempt0.in
similarity index 100%
rename from round_2/football-small-attempt0.in
rename to 2010-2/B-world-cup-2010-small-attempt0.in
diff --git a/round_2/football.hs b/2010-2/B-world-cup-2010.hs
similarity index 100%
rename from round_2/football.hs
rename to 2010-2/B-world-cup-2010.hs
diff --git a/round_2/bacteria-small-attempt0.in b/2010-2/C-bacteria-small-attempt0.in
similarity index 100%
rename from round_2/bacteria-small-attempt0.in
rename to 2010-2/C-bacteria-small-attempt0.in
diff --git a/round_2/bacteria.hs b/2010-2/C-bacteria.hs
similarity index 100%
rename from round_2/bacteria.hs
rename to 2010-2/C-bacteria.hs
diff --git a/round_2/template.hs b/2010-2/template.hs
similarity index 100%
rename from round_2/template.hs
rename to 2010-2/template.hs
diff --git a/round_3/fence.hs b/2010-3/B-fence.hs
similarity index 100%
rename from round_3/fence.hs
rename to 2010-3/B-fence.hs
diff --git a/finals/stamper.cc b/2010-4-Finals/A-letter-stamper.cc
similarity index 100%
rename from finals/stamper.cc
rename to 2010-4-Finals/A-letter-stamper.cc
diff --git a/finals/stamper.hs b/2010-4-Finals/A-letter-stamper.s
similarity index 100%
rename from finals/stamper.hs
rename to 2010-4-Finals/A-letter-stamper.s
diff --git a/finals/candy.hs b/2010-4-Finals/C-candy-store.hs
similarity index 100%
rename from finals/candy.hs
rename to 2010-4-Finals/C-candy-store.hs
diff --git a/finals/travel.hs b/2010-4-Finals/D-travel-plan.hs
similarity index 100%
rename from finals/travel.hs
rename to 2010-4-Finals/D-travel-plan.hs
diff --git a/finals/ninjutsu.hs b/2010-4-Finals/E-ninjutsu.hs
similarity index 100%
rename from finals/ninjutsu.hs
rename to 2010-4-Finals/E-ninjutsu.hs
diff --git a/qualif/Makefile b/qualif/Makefile
deleted file mode 100644
index 59df605..0000000
--- a/qualif/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-snapper2: snapper2.o
-	ld -s -o $@ $^
-
-snapper2.o: snapper2.S
-	as -o $@ $<