diff --git a/google_code_jam/.vimrc.local b/puzzles/google_code_jam/.vimrc.local
similarity index 100%
rename from google_code_jam/.vimrc.local
rename to puzzles/google_code_jam/.vimrc.local
diff --git a/google_code_jam/2013/1A-A-bullseye-sample.in b/puzzles/google_code_jam/2013/1A-A-bullseye-sample.in
similarity index 100%
rename from google_code_jam/2013/1A-A-bullseye-sample.in
rename to puzzles/google_code_jam/2013/1A-A-bullseye-sample.in
diff --git a/google_code_jam/2013/1A-A-bullseye.cpp b/puzzles/google_code_jam/2013/1A-A-bullseye.cpp
similarity index 100%
rename from google_code_jam/2013/1A-A-bullseye.cpp
rename to puzzles/google_code_jam/2013/1A-A-bullseye.cpp
diff --git a/google_code_jam/2013/1A-A-large-practice.in b/puzzles/google_code_jam/2013/1A-A-large-practice.in
similarity index 100%
rename from google_code_jam/2013/1A-A-large-practice.in
rename to puzzles/google_code_jam/2013/1A-A-large-practice.in
diff --git a/google_code_jam/2013/1A-A-small-practice.in b/puzzles/google_code_jam/2013/1A-A-small-practice.in
similarity index 100%
rename from google_code_jam/2013/1A-A-small-practice.in
rename to puzzles/google_code_jam/2013/1A-A-small-practice.in
diff --git a/google_code_jam/2013/1A-B-energy.cpp b/puzzles/google_code_jam/2013/1A-B-energy.cpp
similarity index 100%
rename from google_code_jam/2013/1A-B-energy.cpp
rename to puzzles/google_code_jam/2013/1A-B-energy.cpp
diff --git a/google_code_jam/2013/1A-B-large-practice.in b/puzzles/google_code_jam/2013/1A-B-large-practice.in
similarity index 100%
rename from google_code_jam/2013/1A-B-large-practice.in
rename to puzzles/google_code_jam/2013/1A-B-large-practice.in
diff --git a/google_code_jam/2013/1A-B-sample.in b/puzzles/google_code_jam/2013/1A-B-sample.in
similarity index 100%
rename from google_code_jam/2013/1A-B-sample.in
rename to puzzles/google_code_jam/2013/1A-B-sample.in
diff --git a/google_code_jam/2013/1A-B-small-practice.in b/puzzles/google_code_jam/2013/1A-B-small-practice.in
similarity index 100%
rename from google_code_jam/2013/1A-B-small-practice.in
rename to puzzles/google_code_jam/2013/1A-B-small-practice.in
diff --git a/google_code_jam/2013/1B-A-Osmos.cpp b/puzzles/google_code_jam/2013/1B-A-Osmos.cpp
similarity index 100%
rename from google_code_jam/2013/1B-A-Osmos.cpp
rename to puzzles/google_code_jam/2013/1B-A-Osmos.cpp
diff --git a/google_code_jam/2013/1B-A-large-practice.in b/puzzles/google_code_jam/2013/1B-A-large-practice.in
similarity index 100%
rename from google_code_jam/2013/1B-A-large-practice.in
rename to puzzles/google_code_jam/2013/1B-A-large-practice.in
diff --git a/google_code_jam/2013/1B-A-sample.in b/puzzles/google_code_jam/2013/1B-A-sample.in
similarity index 100%
rename from google_code_jam/2013/1B-A-sample.in
rename to puzzles/google_code_jam/2013/1B-A-sample.in
diff --git a/google_code_jam/2013/1B-A-small-practice.in b/puzzles/google_code_jam/2013/1B-A-small-practice.in
similarity index 100%
rename from google_code_jam/2013/1B-A-small-practice.in
rename to puzzles/google_code_jam/2013/1B-A-small-practice.in
diff --git a/google_code_jam/2013/1B-B-diamonds.cpp b/puzzles/google_code_jam/2013/1B-B-diamonds.cpp
similarity index 100%
rename from google_code_jam/2013/1B-B-diamonds.cpp
rename to puzzles/google_code_jam/2013/1B-B-diamonds.cpp
diff --git a/google_code_jam/2013/1B-B-large-practice.in b/puzzles/google_code_jam/2013/1B-B-large-practice.in
similarity index 100%
rename from google_code_jam/2013/1B-B-large-practice.in
rename to puzzles/google_code_jam/2013/1B-B-large-practice.in
diff --git a/google_code_jam/2013/1B-B-sample.in b/puzzles/google_code_jam/2013/1B-B-sample.in
similarity index 100%
rename from google_code_jam/2013/1B-B-sample.in
rename to puzzles/google_code_jam/2013/1B-B-sample.in
diff --git a/google_code_jam/2013/1B-B-small-practice.in b/puzzles/google_code_jam/2013/1B-B-small-practice.in
similarity index 100%
rename from google_code_jam/2013/1B-B-small-practice.in
rename to puzzles/google_code_jam/2013/1B-B-small-practice.in
diff --git a/google_code_jam/2013/tic_tac_A-large-practice.in b/puzzles/google_code_jam/2013/tic_tac_A-large-practice.in
similarity index 100%
rename from google_code_jam/2013/tic_tac_A-large-practice.in
rename to puzzles/google_code_jam/2013/tic_tac_A-large-practice.in
diff --git a/google_code_jam/2013/tic_tac_A-small-practice.in b/puzzles/google_code_jam/2013/tic_tac_A-small-practice.in
similarity index 100%
rename from google_code_jam/2013/tic_tac_A-small-practice.in
rename to puzzles/google_code_jam/2013/tic_tac_A-small-practice.in
diff --git a/google_code_jam/2013/tic_tac_toy_tomek.cpp b/puzzles/google_code_jam/2013/tic_tac_toy_tomek.cpp
similarity index 100%
rename from google_code_jam/2013/tic_tac_toy_tomek.cpp
rename to puzzles/google_code_jam/2013/tic_tac_toy_tomek.cpp
diff --git a/google_code_jam/2013/tic_tac_toy_tomek.sample_input b/puzzles/google_code_jam/2013/tic_tac_toy_tomek.sample_input
similarity index 100%
rename from google_code_jam/2013/tic_tac_toy_tomek.sample_input
rename to puzzles/google_code_jam/2013/tic_tac_toy_tomek.sample_input
diff --git a/google_code_jam/2014/0-A-magic_trick-sample.in b/puzzles/google_code_jam/2014/0-A-magic_trick-sample.in
similarity index 100%
rename from google_code_jam/2014/0-A-magic_trick-sample.in
rename to puzzles/google_code_jam/2014/0-A-magic_trick-sample.in
diff --git a/google_code_jam/2014/0-A-magic_trick-small-attempt0.in b/puzzles/google_code_jam/2014/0-A-magic_trick-small-attempt0.in
similarity index 100%
rename from google_code_jam/2014/0-A-magic_trick-small-attempt0.in
rename to puzzles/google_code_jam/2014/0-A-magic_trick-small-attempt0.in
diff --git a/google_code_jam/2014/0-A-magic_trick.cpp b/puzzles/google_code_jam/2014/0-A-magic_trick.cpp
similarity index 100%
rename from google_code_jam/2014/0-A-magic_trick.cpp
rename to puzzles/google_code_jam/2014/0-A-magic_trick.cpp
diff --git a/google_code_jam/2014/0-B-cookie-sample.in b/puzzles/google_code_jam/2014/0-B-cookie-sample.in
similarity index 100%
rename from google_code_jam/2014/0-B-cookie-sample.in
rename to puzzles/google_code_jam/2014/0-B-cookie-sample.in
diff --git a/google_code_jam/2014/0-B-cookie.cpp b/puzzles/google_code_jam/2014/0-B-cookie.cpp
similarity index 100%
rename from google_code_jam/2014/0-B-cookie.cpp
rename to puzzles/google_code_jam/2014/0-B-cookie.cpp
diff --git a/google_code_jam/2014/0-B-large.in b/puzzles/google_code_jam/2014/0-B-large.in
similarity index 100%
rename from google_code_jam/2014/0-B-large.in
rename to puzzles/google_code_jam/2014/0-B-large.in
diff --git a/google_code_jam/2014/0-B-small-attempt0.in b/puzzles/google_code_jam/2014/0-B-small-attempt0.in
similarity index 100%
rename from google_code_jam/2014/0-B-small-attempt0.in
rename to puzzles/google_code_jam/2014/0-B-small-attempt0.in
diff --git a/google_code_jam/2014/0-C-large.in b/puzzles/google_code_jam/2014/0-C-large.in
similarity index 100%
rename from google_code_jam/2014/0-C-large.in
rename to puzzles/google_code_jam/2014/0-C-large.in
diff --git a/google_code_jam/2014/0-C-mine-sample.in b/puzzles/google_code_jam/2014/0-C-mine-sample.in
similarity index 100%
rename from google_code_jam/2014/0-C-mine-sample.in
rename to puzzles/google_code_jam/2014/0-C-mine-sample.in
diff --git a/google_code_jam/2014/0-C-mine.cpp b/puzzles/google_code_jam/2014/0-C-mine.cpp
similarity index 100%
rename from google_code_jam/2014/0-C-mine.cpp
rename to puzzles/google_code_jam/2014/0-C-mine.cpp
diff --git a/google_code_jam/2014/0-C-small-attempt0.in b/puzzles/google_code_jam/2014/0-C-small-attempt0.in
similarity index 100%
rename from google_code_jam/2014/0-C-small-attempt0.in
rename to puzzles/google_code_jam/2014/0-C-small-attempt0.in
diff --git a/google_code_jam/2014/0-D-deceitful-sample.in b/puzzles/google_code_jam/2014/0-D-deceitful-sample.in
similarity index 100%
rename from google_code_jam/2014/0-D-deceitful-sample.in
rename to puzzles/google_code_jam/2014/0-D-deceitful-sample.in
diff --git a/google_code_jam/2014/0-D-deceitful.cpp b/puzzles/google_code_jam/2014/0-D-deceitful.cpp
similarity index 100%
rename from google_code_jam/2014/0-D-deceitful.cpp
rename to puzzles/google_code_jam/2014/0-D-deceitful.cpp
diff --git a/google_code_jam/2014/0-D-large.in b/puzzles/google_code_jam/2014/0-D-large.in
similarity index 100%
rename from google_code_jam/2014/0-D-large.in
rename to puzzles/google_code_jam/2014/0-D-large.in
diff --git a/google_code_jam/2014/0-D-small-attempt0.in b/puzzles/google_code_jam/2014/0-D-small-attempt0.in
similarity index 100%
rename from google_code_jam/2014/0-D-small-attempt0.in
rename to puzzles/google_code_jam/2014/0-D-small-attempt0.in
diff --git a/google_code_jam/2014/1A-A-code_jam.cpp b/puzzles/google_code_jam/2014/1A-A-code_jam.cpp
similarity index 100%
rename from google_code_jam/2014/1A-A-code_jam.cpp
rename to puzzles/google_code_jam/2014/1A-A-code_jam.cpp
diff --git a/google_code_jam/2014/1A-A-large-practice.in b/puzzles/google_code_jam/2014/1A-A-large-practice.in
similarity index 100%
rename from google_code_jam/2014/1A-A-large-practice.in
rename to puzzles/google_code_jam/2014/1A-A-large-practice.in
diff --git a/google_code_jam/2014/1A-A-sample.in b/puzzles/google_code_jam/2014/1A-A-sample.in
similarity index 100%
rename from google_code_jam/2014/1A-A-sample.in
rename to puzzles/google_code_jam/2014/1A-A-sample.in
diff --git a/google_code_jam/2014/1A-A-small-practice.in b/puzzles/google_code_jam/2014/1A-A-small-practice.in
similarity index 100%
rename from google_code_jam/2014/1A-A-small-practice.in
rename to puzzles/google_code_jam/2014/1A-A-small-practice.in
diff --git a/google_code_jam/2014/1A-B-code_jam.cpp b/puzzles/google_code_jam/2014/1A-B-code_jam.cpp
similarity index 100%
rename from google_code_jam/2014/1A-B-code_jam.cpp
rename to puzzles/google_code_jam/2014/1A-B-code_jam.cpp
diff --git a/google_code_jam/2014/1A-B-large-practice.in b/puzzles/google_code_jam/2014/1A-B-large-practice.in
similarity index 100%
rename from google_code_jam/2014/1A-B-large-practice.in
rename to puzzles/google_code_jam/2014/1A-B-large-practice.in
diff --git a/google_code_jam/2014/1A-B-sample.in b/puzzles/google_code_jam/2014/1A-B-sample.in
similarity index 100%
rename from google_code_jam/2014/1A-B-sample.in
rename to puzzles/google_code_jam/2014/1A-B-sample.in
diff --git a/google_code_jam/2014/1A-B-small-attempt0.in b/puzzles/google_code_jam/2014/1A-B-small-attempt0.in
similarity index 100%
rename from google_code_jam/2014/1A-B-small-attempt0.in
rename to puzzles/google_code_jam/2014/1A-B-small-attempt0.in
diff --git a/google_code_jam/2014/1A-B-small-attempt1.in b/puzzles/google_code_jam/2014/1A-B-small-attempt1.in
similarity index 100%
rename from google_code_jam/2014/1A-B-small-attempt1.in
rename to puzzles/google_code_jam/2014/1A-B-small-attempt1.in
diff --git a/google_code_jam/2014/1A-B-small-practice.in b/puzzles/google_code_jam/2014/1A-B-small-practice.in
similarity index 100%
rename from google_code_jam/2014/1A-B-small-practice.in
rename to puzzles/google_code_jam/2014/1A-B-small-practice.in
diff --git a/google_code_jam/2014/1A-C-small-practice.in b/puzzles/google_code_jam/2014/1A-C-small-practice.in
similarity index 100%
rename from google_code_jam/2014/1A-C-small-practice.in
rename to puzzles/google_code_jam/2014/1A-C-small-practice.in
diff --git a/google_code_jam/2014/1B-A-large.in b/puzzles/google_code_jam/2014/1B-A-large.in
similarity index 100%
rename from google_code_jam/2014/1B-A-large.in
rename to puzzles/google_code_jam/2014/1B-A-large.in
diff --git a/google_code_jam/2014/1B-A-repeater.cpp b/puzzles/google_code_jam/2014/1B-A-repeater.cpp
similarity index 100%
rename from google_code_jam/2014/1B-A-repeater.cpp
rename to puzzles/google_code_jam/2014/1B-A-repeater.cpp
diff --git a/google_code_jam/2014/1B-A-small-attempt0.in b/puzzles/google_code_jam/2014/1B-A-small-attempt0.in
similarity index 100%
rename from google_code_jam/2014/1B-A-small-attempt0.in
rename to puzzles/google_code_jam/2014/1B-A-small-attempt0.in
diff --git a/google_code_jam/2014/1B-A-small-attempt1.in b/puzzles/google_code_jam/2014/1B-A-small-attempt1.in
similarity index 100%
rename from google_code_jam/2014/1B-A-small-attempt1.in
rename to puzzles/google_code_jam/2014/1B-A-small-attempt1.in
diff --git a/google_code_jam/2014/1B-B-lottery.cpp b/puzzles/google_code_jam/2014/1B-B-lottery.cpp
similarity index 100%
rename from google_code_jam/2014/1B-B-lottery.cpp
rename to puzzles/google_code_jam/2014/1B-B-lottery.cpp
diff --git a/google_code_jam/2014/1B-B-small-attempt0.in b/puzzles/google_code_jam/2014/1B-B-small-attempt0.in
similarity index 100%
rename from google_code_jam/2014/1B-B-small-attempt0.in
rename to puzzles/google_code_jam/2014/1B-B-small-attempt0.in
diff --git a/google_code_jam/2014/1C-A-large.in b/puzzles/google_code_jam/2014/1C-A-large.in
similarity index 100%
rename from google_code_jam/2014/1C-A-large.in
rename to puzzles/google_code_jam/2014/1C-A-large.in
diff --git a/google_code_jam/2014/1C-A-small-attempt0.in b/puzzles/google_code_jam/2014/1C-A-small-attempt0.in
similarity index 100%
rename from google_code_jam/2014/1C-A-small-attempt0.in
rename to puzzles/google_code_jam/2014/1C-A-small-attempt0.in
diff --git a/google_code_jam/2014/1C-A.cpp b/puzzles/google_code_jam/2014/1C-A.cpp
similarity index 100%
rename from google_code_jam/2014/1C-A.cpp
rename to puzzles/google_code_jam/2014/1C-A.cpp
diff --git a/google_code_jam/2014/1C-B-small-attempt0.in b/puzzles/google_code_jam/2014/1C-B-small-attempt0.in
similarity index 100%
rename from google_code_jam/2014/1C-B-small-attempt0.in
rename to puzzles/google_code_jam/2014/1C-B-small-attempt0.in
diff --git a/google_code_jam/2014/1C-B-small-attempt1.in b/puzzles/google_code_jam/2014/1C-B-small-attempt1.in
similarity index 100%
rename from google_code_jam/2014/1C-B-small-attempt1.in
rename to puzzles/google_code_jam/2014/1C-B-small-attempt1.in
diff --git a/google_code_jam/2014/1C-B.cpp b/puzzles/google_code_jam/2014/1C-B.cpp
similarity index 100%
rename from google_code_jam/2014/1C-B.cpp
rename to puzzles/google_code_jam/2014/1C-B.cpp
diff --git a/google_code_jam/2014/2-A-large-practice.in b/puzzles/google_code_jam/2014/2-A-large-practice.in
similarity index 100%
rename from google_code_jam/2014/2-A-large-practice.in
rename to puzzles/google_code_jam/2014/2-A-large-practice.in
diff --git a/google_code_jam/2014/2-A-sample.in b/puzzles/google_code_jam/2014/2-A-sample.in
similarity index 100%
rename from google_code_jam/2014/2-A-sample.in
rename to puzzles/google_code_jam/2014/2-A-sample.in
diff --git a/google_code_jam/2014/2-A-small-practice.in b/puzzles/google_code_jam/2014/2-A-small-practice.in
similarity index 100%
rename from google_code_jam/2014/2-A-small-practice.in
rename to puzzles/google_code_jam/2014/2-A-small-practice.in
diff --git a/google_code_jam/2014/2-A.cpp b/puzzles/google_code_jam/2014/2-A.cpp
similarity index 100%
rename from google_code_jam/2014/2-A.cpp
rename to puzzles/google_code_jam/2014/2-A.cpp
diff --git a/google_code_jam/library.h b/puzzles/google_code_jam/library.h
similarity index 100%
rename from google_code_jam/library.h
rename to puzzles/google_code_jam/library.h