diff --git a/Makefile b/cpp-source/Makefile
similarity index 100%
rename from Makefile
rename to cpp-source/Makefile
diff --git a/Makefile.macosx b/cpp-source/Makefile.macosx
similarity index 100%
rename from Makefile.macosx
rename to cpp-source/Makefile.macosx
diff --git a/Makefile.win b/cpp-source/Makefile.win
similarity index 100%
rename from Makefile.win
rename to cpp-source/Makefile.win
diff --git a/README b/cpp-source/README
similarity index 100%
rename from README
rename to cpp-source/README
diff --git a/buffer.cpp b/cpp-source/buffer.cpp
similarity index 100%
rename from buffer.cpp
rename to cpp-source/buffer.cpp
diff --git a/buffer.h b/cpp-source/buffer.h
similarity index 100%
rename from buffer.h
rename to cpp-source/buffer.h
diff --git a/conf.cpp b/cpp-source/conf.cpp
similarity index 100%
rename from conf.cpp
rename to cpp-source/conf.cpp
diff --git a/conf.h b/cpp-source/conf.h
similarity index 100%
rename from conf.h
rename to cpp-source/conf.h
diff --git a/convert.cpp b/cpp-source/convert.cpp
similarity index 100%
rename from convert.cpp
rename to cpp-source/convert.cpp
diff --git a/convert.h b/cpp-source/convert.h
similarity index 100%
rename from convert.h
rename to cpp-source/convert.h
diff --git a/descr.cpp b/cpp-source/descr.cpp
similarity index 100%
rename from descr.cpp
rename to cpp-source/descr.cpp
diff --git a/descr.h b/cpp-source/descr.h
similarity index 100%
rename from descr.h
rename to cpp-source/descr.h
diff --git a/exceptions.h b/cpp-source/exceptions.h
similarity index 100%
rename from exceptions.h
rename to cpp-source/exceptions.h
diff --git a/font.cpp b/cpp-source/font.cpp
similarity index 100%
rename from font.cpp
rename to cpp-source/font.cpp
diff --git a/font.h b/cpp-source/font.h
similarity index 100%
rename from font.h
rename to cpp-source/font.h
diff --git a/formatter.cpp b/cpp-source/formatter.cpp
similarity index 100%
rename from formatter.cpp
rename to cpp-source/formatter.cpp
diff --git a/formatter.h b/cpp-source/formatter.h
similarity index 100%
rename from formatter.h
rename to cpp-source/formatter.h
diff --git a/game.cpp b/cpp-source/game.cpp
similarity index 100%
rename from game.cpp
rename to cpp-source/game.cpp
diff --git a/game.h b/cpp-source/game.h
similarity index 100%
rename from game.h
rename to cpp-source/game.h
diff --git a/horhints.cpp b/cpp-source/horhints.cpp
similarity index 100%
rename from horhints.cpp
rename to cpp-source/horhints.cpp
diff --git a/horhints.h b/cpp-source/horhints.h
similarity index 100%
rename from horhints.h
rename to cpp-source/horhints.h
diff --git a/i18n.cpp b/cpp-source/i18n.cpp
similarity index 100%
rename from i18n.cpp
rename to cpp-source/i18n.cpp
diff --git a/i18n.h b/cpp-source/i18n.h
similarity index 100%
rename from i18n.h
rename to cpp-source/i18n.h
diff --git a/iconset.cpp b/cpp-source/iconset.cpp
similarity index 100%
rename from iconset.cpp
rename to cpp-source/iconset.cpp
diff --git a/iconset.h b/cpp-source/iconset.h
similarity index 100%
rename from iconset.h
rename to cpp-source/iconset.h
diff --git a/lexal.cpp b/cpp-source/lexal.cpp
similarity index 100%
rename from lexal.cpp
rename to cpp-source/lexal.cpp
diff --git a/lexal.h b/cpp-source/lexal.h
similarity index 100%
rename from lexal.h
rename to cpp-source/lexal.h
diff --git a/main.cpp b/cpp-source/main.cpp
similarity index 100%
rename from main.cpp
rename to cpp-source/main.cpp
diff --git a/main.h b/cpp-source/main.h
similarity index 100%
rename from main.h
rename to cpp-source/main.h
diff --git a/menu.cpp b/cpp-source/menu.cpp
similarity index 100%
rename from menu.cpp
rename to cpp-source/menu.cpp
diff --git a/messages.cpp b/cpp-source/messages.cpp
similarity index 100%
rename from messages.cpp
rename to cpp-source/messages.cpp
diff --git a/messages.h b/cpp-source/messages.h
similarity index 100%
rename from messages.h
rename to cpp-source/messages.h
diff --git a/opensave.cpp b/cpp-source/opensave.cpp
similarity index 100%
rename from opensave.cpp
rename to cpp-source/opensave.cpp
diff --git a/opensave.h b/cpp-source/opensave.h
similarity index 100%
rename from opensave.h
rename to cpp-source/opensave.h
diff --git a/options.cpp b/cpp-source/options.cpp
similarity index 100%
rename from options.cpp
rename to cpp-source/options.cpp
diff --git a/options.h b/cpp-source/options.h
similarity index 100%
rename from options.h
rename to cpp-source/options.h
diff --git a/puzgen.cpp b/cpp-source/puzgen.cpp
similarity index 100%
rename from puzgen.cpp
rename to cpp-source/puzgen.cpp
diff --git a/puzgen.h b/cpp-source/puzgen.h
similarity index 100%
rename from puzgen.h
rename to cpp-source/puzgen.h
diff --git a/puzzle.cpp b/cpp-source/puzzle.cpp
similarity index 100%
rename from puzzle.cpp
rename to cpp-source/puzzle.cpp
diff --git a/puzzle.h b/cpp-source/puzzle.h
similarity index 100%
rename from puzzle.h
rename to cpp-source/puzzle.h
diff --git a/random.cpp b/cpp-source/random.cpp
similarity index 100%
rename from random.cpp
rename to cpp-source/random.cpp
diff --git a/random.h b/cpp-source/random.h
similarity index 100%
rename from random.h
rename to cpp-source/random.h
diff --git a/regstorage.cpp b/cpp-source/regstorage.cpp
similarity index 100%
rename from regstorage.cpp
rename to cpp-source/regstorage.cpp
diff --git a/regstorage.h b/cpp-source/regstorage.h
similarity index 100%
rename from regstorage.h
rename to cpp-source/regstorage.h
diff --git a/resources.cpp b/cpp-source/resources.cpp
similarity index 100%
rename from resources.cpp
rename to cpp-source/resources.cpp
diff --git a/resources.h b/cpp-source/resources.h
similarity index 100%
rename from resources.h
rename to cpp-source/resources.h
diff --git a/rules.cpp b/cpp-source/rules.cpp
similarity index 100%
rename from rules.cpp
rename to cpp-source/rules.cpp
diff --git a/screen.cpp b/cpp-source/screen.cpp
similarity index 100%
rename from screen.cpp
rename to cpp-source/screen.cpp
diff --git a/screen.h b/cpp-source/screen.h
similarity index 100%
rename from screen.h
rename to cpp-source/screen.h
diff --git a/sound.cpp b/cpp-source/sound.cpp
similarity index 100%
rename from sound.cpp
rename to cpp-source/sound.cpp
diff --git a/sound.h b/cpp-source/sound.h
similarity index 100%
rename from sound.h
rename to cpp-source/sound.h
diff --git a/storage.cpp b/cpp-source/storage.cpp
similarity index 100%
rename from storage.cpp
rename to cpp-source/storage.cpp
diff --git a/storage.h b/cpp-source/storage.h
similarity index 100%
rename from storage.h
rename to cpp-source/storage.h
diff --git a/streams.cpp b/cpp-source/streams.cpp
similarity index 100%
rename from streams.cpp
rename to cpp-source/streams.cpp
diff --git a/streams.h b/cpp-source/streams.h
similarity index 100%
rename from streams.h
rename to cpp-source/streams.h
diff --git a/table.cpp b/cpp-source/table.cpp
similarity index 100%
rename from table.cpp
rename to cpp-source/table.cpp
diff --git a/table.h b/cpp-source/table.h
similarity index 100%
rename from table.h
rename to cpp-source/table.h
diff --git a/tablestorage.cpp b/cpp-source/tablestorage.cpp
similarity index 100%
rename from tablestorage.cpp
rename to cpp-source/tablestorage.cpp
diff --git a/tablestorage.h b/cpp-source/tablestorage.h
similarity index 100%
rename from tablestorage.h
rename to cpp-source/tablestorage.h
diff --git a/tokenizer.cpp b/cpp-source/tokenizer.cpp
similarity index 100%
rename from tokenizer.cpp
rename to cpp-source/tokenizer.cpp
diff --git a/tokenizer.h b/cpp-source/tokenizer.h
similarity index 100%
rename from tokenizer.h
rename to cpp-source/tokenizer.h
diff --git a/topscores.cpp b/cpp-source/topscores.cpp
similarity index 100%
rename from topscores.cpp
rename to cpp-source/topscores.cpp
diff --git a/topscores.h b/cpp-source/topscores.h
similarity index 100%
rename from topscores.h
rename to cpp-source/topscores.h
diff --git a/unicode.cpp b/cpp-source/unicode.cpp
similarity index 100%
rename from unicode.cpp
rename to cpp-source/unicode.cpp
diff --git a/unicode.h b/cpp-source/unicode.h
similarity index 100%
rename from unicode.h
rename to cpp-source/unicode.h
diff --git a/utils.cpp b/cpp-source/utils.cpp
similarity index 100%
rename from utils.cpp
rename to cpp-source/utils.cpp
diff --git a/utils.h b/cpp-source/utils.h
similarity index 100%
rename from utils.h
rename to cpp-source/utils.h
diff --git a/verthints.cpp b/cpp-source/verthints.cpp
similarity index 100%
rename from verthints.cpp
rename to cpp-source/verthints.cpp
diff --git a/verthints.h b/cpp-source/verthints.h
similarity index 100%
rename from verthints.h
rename to cpp-source/verthints.h
diff --git a/visitor.h b/cpp-source/visitor.h
similarity index 100%
rename from visitor.h
rename to cpp-source/visitor.h
diff --git a/widgets.cpp b/cpp-source/widgets.cpp
similarity index 100%
rename from widgets.cpp
rename to cpp-source/widgets.cpp
diff --git a/widgets.h b/cpp-source/widgets.h
similarity index 100%
rename from widgets.h
rename to cpp-source/widgets.h