diff --git a/language/CMakeLists.txt b/language/culebra/CMakeLists.txt
similarity index 100%
rename from language/CMakeLists.txt
rename to language/culebra/CMakeLists.txt
diff --git a/language/cul.vim b/language/culebra/cul.vim
similarity index 100%
rename from language/cul.vim
rename to language/culebra/cul.vim
diff --git a/language/culebra.h b/language/culebra/culebra.h
similarity index 100%
rename from language/culebra.h
rename to language/culebra/culebra.h
diff --git a/language/linenoise.hpp b/language/culebra/linenoise.hpp
similarity index 100%
rename from language/linenoise.hpp
rename to language/culebra/linenoise.hpp
diff --git a/language/main.cc b/language/culebra/main.cc
similarity index 100%
rename from language/main.cc
rename to language/culebra/main.cc
diff --git a/language/samples/closure.cul b/language/culebra/samples/closure.cul
similarity index 100%
rename from language/samples/closure.cul
rename to language/culebra/samples/closure.cul
diff --git a/language/samples/fib.cul b/language/culebra/samples/fib.cul
similarity index 100%
rename from language/samples/fib.cul
rename to language/culebra/samples/fib.cul
diff --git a/language/samples/fizzbuzz.cul b/language/culebra/samples/fizzbuzz.cul
similarity index 100%
rename from language/samples/fizzbuzz.cul
rename to language/culebra/samples/fizzbuzz.cul
diff --git a/language/samples/test.cul b/language/culebra/samples/test.cul
similarity index 100%
rename from language/samples/test.cul
rename to language/culebra/samples/test.cul
diff --git a/language/vc14/culebra.sln b/language/culebra/vc14/culebra.sln
similarity index 100%
rename from language/vc14/culebra.sln
rename to language/culebra/vc14/culebra.sln
diff --git a/language/vc14/culebra.vcxproj b/language/culebra/vc14/culebra.vcxproj
similarity index 100%
rename from language/vc14/culebra.vcxproj
rename to language/culebra/vc14/culebra.vcxproj