diff --git a/compiler/cpp.mk b/compiler/cpp/cpp.mk
similarity index 100%
rename from compiler/cpp.mk
rename to compiler/cpp/cpp.mk
diff --git a/compiler/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc
similarity index 100%
rename from compiler/src/generate/t_cpp_generator.cc
rename to compiler/cpp/src/generate/t_cpp_generator.cc
diff --git a/compiler/src/generate/t_cpp_generator.h b/compiler/cpp/src/generate/t_cpp_generator.h
similarity index 100%
rename from compiler/src/generate/t_cpp_generator.h
rename to compiler/cpp/src/generate/t_cpp_generator.h
diff --git a/compiler/src/generate/t_generator.cc b/compiler/cpp/src/generate/t_generator.cc
similarity index 100%
rename from compiler/src/generate/t_generator.cc
rename to compiler/cpp/src/generate/t_generator.cc
diff --git a/compiler/src/generate/t_generator.h b/compiler/cpp/src/generate/t_generator.h
similarity index 100%
rename from compiler/src/generate/t_generator.h
rename to compiler/cpp/src/generate/t_generator.h
diff --git a/compiler/src/generate/t_java_generator.cc b/compiler/cpp/src/generate/t_java_generator.cc
similarity index 100%
rename from compiler/src/generate/t_java_generator.cc
rename to compiler/cpp/src/generate/t_java_generator.cc
diff --git a/compiler/src/generate/t_java_generator.h b/compiler/cpp/src/generate/t_java_generator.h
similarity index 100%
rename from compiler/src/generate/t_java_generator.h
rename to compiler/cpp/src/generate/t_java_generator.h
diff --git a/compiler/src/generate/t_oop_generator.h b/compiler/cpp/src/generate/t_oop_generator.h
similarity index 100%
rename from compiler/src/generate/t_oop_generator.h
rename to compiler/cpp/src/generate/t_oop_generator.h
diff --git a/compiler/src/generate/t_php_generator.cc b/compiler/cpp/src/generate/t_php_generator.cc
similarity index 100%
rename from compiler/src/generate/t_php_generator.cc
rename to compiler/cpp/src/generate/t_php_generator.cc
diff --git a/compiler/src/generate/t_php_generator.h b/compiler/cpp/src/generate/t_php_generator.h
similarity index 100%
rename from compiler/src/generate/t_php_generator.h
rename to compiler/cpp/src/generate/t_php_generator.h
diff --git a/compiler/src/globals.h b/compiler/cpp/src/globals.h
similarity index 100%
rename from compiler/src/globals.h
rename to compiler/cpp/src/globals.h
diff --git a/compiler/src/main.cc b/compiler/cpp/src/main.cc
similarity index 100%
rename from compiler/src/main.cc
rename to compiler/cpp/src/main.cc
diff --git a/compiler/src/main.h b/compiler/cpp/src/main.h
similarity index 100%
rename from compiler/src/main.h
rename to compiler/cpp/src/main.h
diff --git a/compiler/src/parse/t_base_type.h b/compiler/cpp/src/parse/t_base_type.h
similarity index 100%
rename from compiler/src/parse/t_base_type.h
rename to compiler/cpp/src/parse/t_base_type.h
diff --git a/compiler/src/parse/t_constant.h b/compiler/cpp/src/parse/t_constant.h
similarity index 100%
rename from compiler/src/parse/t_constant.h
rename to compiler/cpp/src/parse/t_constant.h
diff --git a/compiler/src/parse/t_enum.h b/compiler/cpp/src/parse/t_enum.h
similarity index 100%
rename from compiler/src/parse/t_enum.h
rename to compiler/cpp/src/parse/t_enum.h
diff --git a/compiler/src/parse/t_field.h b/compiler/cpp/src/parse/t_field.h
similarity index 100%
rename from compiler/src/parse/t_field.h
rename to compiler/cpp/src/parse/t_field.h
diff --git a/compiler/src/parse/t_function.h b/compiler/cpp/src/parse/t_function.h
similarity index 100%
rename from compiler/src/parse/t_function.h
rename to compiler/cpp/src/parse/t_function.h
diff --git a/compiler/src/parse/t_list.h b/compiler/cpp/src/parse/t_list.h
similarity index 100%
rename from compiler/src/parse/t_list.h
rename to compiler/cpp/src/parse/t_list.h
diff --git a/compiler/src/parse/t_map.h b/compiler/cpp/src/parse/t_map.h
similarity index 100%
rename from compiler/src/parse/t_map.h
rename to compiler/cpp/src/parse/t_map.h
diff --git a/compiler/src/parse/t_program.h b/compiler/cpp/src/parse/t_program.h
similarity index 100%
rename from compiler/src/parse/t_program.h
rename to compiler/cpp/src/parse/t_program.h
diff --git a/compiler/src/parse/t_service.h b/compiler/cpp/src/parse/t_service.h
similarity index 100%
rename from compiler/src/parse/t_service.h
rename to compiler/cpp/src/parse/t_service.h
diff --git a/compiler/src/parse/t_set.h b/compiler/cpp/src/parse/t_set.h
similarity index 100%
rename from compiler/src/parse/t_set.h
rename to compiler/cpp/src/parse/t_set.h
diff --git a/compiler/src/parse/t_struct.h b/compiler/cpp/src/parse/t_struct.h
similarity index 100%
rename from compiler/src/parse/t_struct.h
rename to compiler/cpp/src/parse/t_struct.h
diff --git a/compiler/src/parse/t_type.h b/compiler/cpp/src/parse/t_type.h
similarity index 100%
rename from compiler/src/parse/t_type.h
rename to compiler/cpp/src/parse/t_type.h
diff --git a/compiler/src/parse/t_typedef.h b/compiler/cpp/src/parse/t_typedef.h
similarity index 100%
rename from compiler/src/parse/t_typedef.h
rename to compiler/cpp/src/parse/t_typedef.h
diff --git a/compiler/src/thrift.l b/compiler/cpp/src/thrift.l
similarity index 100%
rename from compiler/src/thrift.l
rename to compiler/cpp/src/thrift.l
diff --git a/compiler/src/thrift.y b/compiler/cpp/src/thrift.y
similarity index 100%
rename from compiler/src/thrift.y
rename to compiler/cpp/src/thrift.y
diff --git a/compiler/Makefile.am b/compiler/py/Makefile.am
similarity index 100%
rename from compiler/Makefile.am
rename to compiler/py/Makefile.am
diff --git a/compiler/bootstrap.sh b/compiler/py/bootstrap.sh
similarity index 100%
rename from compiler/bootstrap.sh
rename to compiler/py/bootstrap.sh
diff --git a/compiler/configure.ac b/compiler/py/configure.ac
similarity index 100%
rename from compiler/configure.ac
rename to compiler/py/configure.ac
diff --git a/compiler/setup.py b/compiler/py/setup.py
similarity index 100%
rename from compiler/setup.py
rename to compiler/py/setup.py
diff --git a/compiler/src/__init__.py b/compiler/py/src/__init__.py
similarity index 100%
rename from compiler/src/__init__.py
rename to compiler/py/src/__init__.py
diff --git a/compiler/src/cpp_generator.py b/compiler/py/src/cpp_generator.py
similarity index 100%
rename from compiler/src/cpp_generator.py
rename to compiler/py/src/cpp_generator.py
diff --git a/compiler/src/generator.py b/compiler/py/src/generator.py
similarity index 100%
rename from compiler/src/generator.py
rename to compiler/py/src/generator.py
diff --git a/compiler/src/parser.py b/compiler/py/src/parser.py
similarity index 100%
rename from compiler/src/parser.py
rename to compiler/py/src/parser.py
diff --git a/compiler/src/php_generator.py b/compiler/py/src/php_generator.py
similarity index 100%
rename from compiler/src/php_generator.py
rename to compiler/py/src/php_generator.py
diff --git a/compiler/src/thrift b/compiler/py/src/thrift
similarity index 100%
rename from compiler/src/thrift
rename to compiler/py/src/thrift