glsl2: Move the compiler to the subdirectory it will live in in Mesa.

diff --git a/.dir-locals.el b/src/glsl/.dir-locals.el
similarity index 100%
rename from .dir-locals.el
rename to src/glsl/.dir-locals.el

diff --git a/.gitignore b/src/glsl/.gitignore
similarity index 100%
rename from .gitignore
rename to src/glsl/.gitignore

diff --git a/Makefile.am b/src/glsl/Makefile.am
similarity index 100%
rename from Makefile.am
rename to src/glsl/Makefile.am

diff --git a/TODO b/src/glsl/TODO
similarity index 100%
rename from TODO
rename to src/glsl/TODO

diff --git a/ast.h b/src/glsl/ast.h
similarity index 100%
rename from ast.h
rename to src/glsl/ast.h

diff --git a/ast_expr.cpp b/src/glsl/ast_expr.cpp
similarity index 100%
rename from ast_expr.cpp
rename to src/glsl/ast_expr.cpp

diff --git a/ast_function.cpp b/src/glsl/ast_function.cpp
similarity index 100%
rename from ast_function.cpp
rename to src/glsl/ast_function.cpp

diff --git a/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
similarity index 100%
rename from ast_to_hir.cpp
rename to src/glsl/ast_to_hir.cpp

diff --git a/ast_type.cpp b/src/glsl/ast_type.cpp
similarity index 100%
rename from ast_type.cpp
rename to src/glsl/ast_type.cpp

diff --git a/autogen.sh b/src/glsl/autogen.sh
similarity index 100%
rename from autogen.sh
rename to src/glsl/autogen.sh

diff --git a/builtin_function.cpp b/src/glsl/builtin_function.cpp
similarity index 100%
rename from builtin_function.cpp
rename to src/glsl/builtin_function.cpp

diff --git a/builtin_types.h b/src/glsl/builtin_types.h
similarity index 100%
rename from builtin_types.h
rename to src/glsl/builtin_types.h

diff --git a/builtin_variables.h b/src/glsl/builtin_variables.h
similarity index 100%
rename from builtin_variables.h
rename to src/glsl/builtin_variables.h

diff --git a/builtins/110/abs b/src/glsl/builtins/110/abs
similarity index 100%
rename from builtins/110/abs
rename to src/glsl/builtins/110/abs

diff --git a/builtins/110/all b/src/glsl/builtins/110/all
similarity index 100%
rename from builtins/110/all
rename to src/glsl/builtins/110/all

diff --git a/builtins/110/any b/src/glsl/builtins/110/any
similarity index 100%
rename from builtins/110/any
rename to src/glsl/builtins/110/any

diff --git a/builtins/110/asin b/src/glsl/builtins/110/asin
similarity index 100%
rename from builtins/110/asin
rename to src/glsl/builtins/110/asin

diff --git a/builtins/110/atan b/src/glsl/builtins/110/atan
similarity index 100%
rename from builtins/110/atan
rename to src/glsl/builtins/110/atan

diff --git a/builtins/110/ceil b/src/glsl/builtins/110/ceil
similarity index 100%
rename from builtins/110/ceil
rename to src/glsl/builtins/110/ceil

diff --git a/builtins/110/clamp b/src/glsl/builtins/110/clamp
similarity index 100%
rename from builtins/110/clamp
rename to src/glsl/builtins/110/clamp

diff --git a/builtins/110/cos b/src/glsl/builtins/110/cos
similarity index 100%
rename from builtins/110/cos
rename to src/glsl/builtins/110/cos

diff --git a/builtins/110/cross b/src/glsl/builtins/110/cross
similarity index 100%
rename from builtins/110/cross
rename to src/glsl/builtins/110/cross

diff --git a/builtins/110/degrees b/src/glsl/builtins/110/degrees
similarity index 100%
rename from builtins/110/degrees
rename to src/glsl/builtins/110/degrees

diff --git a/builtins/110/distance b/src/glsl/builtins/110/distance
similarity index 100%
rename from builtins/110/distance
rename to src/glsl/builtins/110/distance

diff --git a/builtins/110/dot b/src/glsl/builtins/110/dot
similarity index 100%
rename from builtins/110/dot
rename to src/glsl/builtins/110/dot

diff --git a/builtins/110/equal b/src/glsl/builtins/110/equal
similarity index 100%
rename from builtins/110/equal
rename to src/glsl/builtins/110/equal

diff --git a/builtins/110/exp b/src/glsl/builtins/110/exp
similarity index 100%
rename from builtins/110/exp
rename to src/glsl/builtins/110/exp

diff --git a/builtins/110/exp2 b/src/glsl/builtins/110/exp2
similarity index 100%
rename from builtins/110/exp2
rename to src/glsl/builtins/110/exp2

diff --git a/builtins/110/faceforward b/src/glsl/builtins/110/faceforward
similarity index 100%
rename from builtins/110/faceforward
rename to src/glsl/builtins/110/faceforward

diff --git a/builtins/110/floor b/src/glsl/builtins/110/floor
similarity index 100%
rename from builtins/110/floor
rename to src/glsl/builtins/110/floor

diff --git a/builtins/110/fract b/src/glsl/builtins/110/fract
similarity index 100%
rename from builtins/110/fract
rename to src/glsl/builtins/110/fract

diff --git a/builtins/110/greaterThan b/src/glsl/builtins/110/greaterThan
similarity index 100%
rename from builtins/110/greaterThan
rename to src/glsl/builtins/110/greaterThan

diff --git a/builtins/110/greaterThanEqual b/src/glsl/builtins/110/greaterThanEqual
similarity index 100%
rename from builtins/110/greaterThanEqual
rename to src/glsl/builtins/110/greaterThanEqual

diff --git a/builtins/110/inversesqrt b/src/glsl/builtins/110/inversesqrt
similarity index 100%
rename from builtins/110/inversesqrt
rename to src/glsl/builtins/110/inversesqrt

diff --git a/builtins/110/length b/src/glsl/builtins/110/length
similarity index 100%
rename from builtins/110/length
rename to src/glsl/builtins/110/length

diff --git a/builtins/110/lessThan b/src/glsl/builtins/110/lessThan
similarity index 100%
rename from builtins/110/lessThan
rename to src/glsl/builtins/110/lessThan

diff --git a/builtins/110/lessThanEqual b/src/glsl/builtins/110/lessThanEqual
similarity index 100%
rename from builtins/110/lessThanEqual
rename to src/glsl/builtins/110/lessThanEqual

diff --git a/builtins/110/log b/src/glsl/builtins/110/log
similarity index 100%
rename from builtins/110/log
rename to src/glsl/builtins/110/log

diff --git a/builtins/110/log2 b/src/glsl/builtins/110/log2
similarity index 100%
rename from builtins/110/log2
rename to src/glsl/builtins/110/log2

diff --git a/builtins/110/matrixCompMult b/src/glsl/builtins/110/matrixCompMult
similarity index 100%
rename from builtins/110/matrixCompMult
rename to src/glsl/builtins/110/matrixCompMult

diff --git a/builtins/110/max b/src/glsl/builtins/110/max
similarity index 100%
rename from builtins/110/max
rename to src/glsl/builtins/110/max

diff --git a/builtins/110/min b/src/glsl/builtins/110/min
similarity index 100%
rename from builtins/110/min
rename to src/glsl/builtins/110/min

diff --git a/builtins/110/mix b/src/glsl/builtins/110/mix
similarity index 100%
rename from builtins/110/mix
rename to src/glsl/builtins/110/mix

diff --git a/builtins/110/mod b/src/glsl/builtins/110/mod
similarity index 100%
rename from builtins/110/mod
rename to src/glsl/builtins/110/mod

diff --git a/builtins/110/noise_fake b/src/glsl/builtins/110/noise_fake
similarity index 100%
rename from builtins/110/noise_fake
rename to src/glsl/builtins/110/noise_fake

diff --git a/builtins/110/normalize b/src/glsl/builtins/110/normalize
similarity index 100%
rename from builtins/110/normalize
rename to src/glsl/builtins/110/normalize

diff --git a/builtins/110/not b/src/glsl/builtins/110/not
similarity index 100%
rename from builtins/110/not
rename to src/glsl/builtins/110/not

diff --git a/builtins/110/notEqual b/src/glsl/builtins/110/notEqual
similarity index 100%
rename from builtins/110/notEqual
rename to src/glsl/builtins/110/notEqual

diff --git a/builtins/110/pow b/src/glsl/builtins/110/pow
similarity index 100%
rename from builtins/110/pow
rename to src/glsl/builtins/110/pow

diff --git a/builtins/110/radians b/src/glsl/builtins/110/radians
similarity index 100%
rename from builtins/110/radians
rename to src/glsl/builtins/110/radians

diff --git a/builtins/110/reflect b/src/glsl/builtins/110/reflect
similarity index 100%
rename from builtins/110/reflect
rename to src/glsl/builtins/110/reflect

diff --git a/builtins/110/refract b/src/glsl/builtins/110/refract
similarity index 100%
rename from builtins/110/refract
rename to src/glsl/builtins/110/refract

diff --git a/builtins/110/sign b/src/glsl/builtins/110/sign
similarity index 100%
rename from builtins/110/sign
rename to src/glsl/builtins/110/sign

diff --git a/builtins/110/sin b/src/glsl/builtins/110/sin
similarity index 100%
rename from builtins/110/sin
rename to src/glsl/builtins/110/sin

diff --git a/builtins/110/smoothstep b/src/glsl/builtins/110/smoothstep
similarity index 100%
rename from builtins/110/smoothstep
rename to src/glsl/builtins/110/smoothstep

diff --git a/builtins/110/sqrt b/src/glsl/builtins/110/sqrt
similarity index 100%
rename from builtins/110/sqrt
rename to src/glsl/builtins/110/sqrt

diff --git a/builtins/110/step b/src/glsl/builtins/110/step
similarity index 100%
rename from builtins/110/step
rename to src/glsl/builtins/110/step

diff --git a/builtins/110/tan b/src/glsl/builtins/110/tan
similarity index 100%
rename from builtins/110/tan
rename to src/glsl/builtins/110/tan

diff --git a/builtins/110/textures b/src/glsl/builtins/110/textures
similarity index 100%
rename from builtins/110/textures
rename to src/glsl/builtins/110/textures

diff --git a/builtins/110_fs/derivatives b/src/glsl/builtins/110_fs/derivatives
similarity index 100%
rename from builtins/110_fs/derivatives
rename to src/glsl/builtins/110_fs/derivatives

diff --git a/builtins/110_fs/textures b/src/glsl/builtins/110_fs/textures
similarity index 100%
rename from builtins/110_fs/textures
rename to src/glsl/builtins/110_fs/textures

diff --git a/builtins/110_vs/ftransform b/src/glsl/builtins/110_vs/ftransform
similarity index 100%
rename from builtins/110_vs/ftransform
rename to src/glsl/builtins/110_vs/ftransform

diff --git a/builtins/120/matrixCompMult b/src/glsl/builtins/120/matrixCompMult
similarity index 100%
rename from builtins/120/matrixCompMult
rename to src/glsl/builtins/120/matrixCompMult

diff --git a/builtins/120/outerProduct b/src/glsl/builtins/120/outerProduct
similarity index 100%
rename from builtins/120/outerProduct
rename to src/glsl/builtins/120/outerProduct

diff --git a/builtins/120/transpose b/src/glsl/builtins/120/transpose
similarity index 100%
rename from builtins/120/transpose
rename to src/glsl/builtins/120/transpose

diff --git a/builtins/130/clamp b/src/glsl/builtins/130/clamp
similarity index 100%
rename from builtins/130/clamp
rename to src/glsl/builtins/130/clamp

diff --git a/builtins/130/cosh b/src/glsl/builtins/130/cosh
similarity index 100%
rename from builtins/130/cosh
rename to src/glsl/builtins/130/cosh

diff --git a/builtins/130/equal b/src/glsl/builtins/130/equal
similarity index 100%
rename from builtins/130/equal
rename to src/glsl/builtins/130/equal

diff --git a/builtins/130/greaterThan b/src/glsl/builtins/130/greaterThan
similarity index 100%
rename from builtins/130/greaterThan
rename to src/glsl/builtins/130/greaterThan

diff --git a/builtins/130/greaterThanEqual b/src/glsl/builtins/130/greaterThanEqual
similarity index 100%
rename from builtins/130/greaterThanEqual
rename to src/glsl/builtins/130/greaterThanEqual

diff --git a/builtins/130/lessThan b/src/glsl/builtins/130/lessThan
similarity index 100%
rename from builtins/130/lessThan
rename to src/glsl/builtins/130/lessThan

diff --git a/builtins/130/lessThanEqual b/src/glsl/builtins/130/lessThanEqual
similarity index 100%
rename from builtins/130/lessThanEqual
rename to src/glsl/builtins/130/lessThanEqual

diff --git a/builtins/130/max b/src/glsl/builtins/130/max
similarity index 100%
rename from builtins/130/max
rename to src/glsl/builtins/130/max

diff --git a/builtins/130/min b/src/glsl/builtins/130/min
similarity index 100%
rename from builtins/130/min
rename to src/glsl/builtins/130/min

diff --git a/builtins/130/notEqual b/src/glsl/builtins/130/notEqual
similarity index 100%
rename from builtins/130/notEqual
rename to src/glsl/builtins/130/notEqual

diff --git a/builtins/130/sign b/src/glsl/builtins/130/sign
similarity index 100%
rename from builtins/130/sign
rename to src/glsl/builtins/130/sign

diff --git a/builtins/130/sinh b/src/glsl/builtins/130/sinh
similarity index 100%
rename from builtins/130/sinh
rename to src/glsl/builtins/130/sinh

diff --git a/builtins/130/tanh b/src/glsl/builtins/130/tanh
similarity index 100%
rename from builtins/130/tanh
rename to src/glsl/builtins/130/tanh

diff --git a/builtins/130/texelFetch b/src/glsl/builtins/130/texelFetch
similarity index 100%
rename from builtins/130/texelFetch
rename to src/glsl/builtins/130/texelFetch

diff --git a/builtins/130/texture b/src/glsl/builtins/130/texture
similarity index 100%
rename from builtins/130/texture
rename to src/glsl/builtins/130/texture

diff --git a/builtins/130/textureGrad b/src/glsl/builtins/130/textureGrad
similarity index 100%
rename from builtins/130/textureGrad
rename to src/glsl/builtins/130/textureGrad

diff --git a/builtins/130/textureLod b/src/glsl/builtins/130/textureLod
similarity index 100%
rename from builtins/130/textureLod
rename to src/glsl/builtins/130/textureLod

diff --git a/builtins/130/textureProj b/src/glsl/builtins/130/textureProj
similarity index 100%
rename from builtins/130/textureProj
rename to src/glsl/builtins/130/textureProj

diff --git a/builtins/130/textureProjGrad b/src/glsl/builtins/130/textureProjGrad
similarity index 100%
rename from builtins/130/textureProjGrad
rename to src/glsl/builtins/130/textureProjGrad

diff --git a/builtins/130/textureProjLod b/src/glsl/builtins/130/textureProjLod
similarity index 100%
rename from builtins/130/textureProjLod
rename to src/glsl/builtins/130/textureProjLod

diff --git a/builtins/130_fs/texture b/src/glsl/builtins/130_fs/texture
similarity index 100%
rename from builtins/130_fs/texture
rename to src/glsl/builtins/130_fs/texture

diff --git a/builtins/130_fs/textureProj b/src/glsl/builtins/130_fs/textureProj
similarity index 100%
rename from builtins/130_fs/textureProj
rename to src/glsl/builtins/130_fs/textureProj

diff --git a/builtins/ARB_texture_rectangle/textures b/src/glsl/builtins/ARB_texture_rectangle/textures
similarity index 100%
rename from builtins/ARB_texture_rectangle/textures
rename to src/glsl/builtins/ARB_texture_rectangle/textures

diff --git a/builtins/EXT_texture_array/textures b/src/glsl/builtins/EXT_texture_array/textures
similarity index 100%
rename from builtins/EXT_texture_array/textures
rename to src/glsl/builtins/EXT_texture_array/textures

diff --git a/builtins/EXT_texture_array_fs/textures b/src/glsl/builtins/EXT_texture_array_fs/textures
similarity index 100%
rename from builtins/EXT_texture_array_fs/textures
rename to src/glsl/builtins/EXT_texture_array_fs/textures

diff --git a/builtins/tools/generate_builtins.pl b/src/glsl/builtins/tools/generate_builtins.pl
similarity index 100%
rename from builtins/tools/generate_builtins.pl
rename to src/glsl/builtins/tools/generate_builtins.pl

diff --git a/builtins/tools/generate_matrixCompMultGLSL.py b/src/glsl/builtins/tools/generate_matrixCompMultGLSL.py
similarity index 100%
rename from builtins/tools/generate_matrixCompMultGLSL.py
rename to src/glsl/builtins/tools/generate_matrixCompMultGLSL.py

diff --git a/builtins/tools/generate_outerProductGLSL.py b/src/glsl/builtins/tools/generate_outerProductGLSL.py
similarity index 100%
rename from builtins/tools/generate_outerProductGLSL.py
rename to src/glsl/builtins/tools/generate_outerProductGLSL.py

diff --git a/builtins/tools/generate_transposeGLSL.py b/src/glsl/builtins/tools/generate_transposeGLSL.py
similarity index 100%
rename from builtins/tools/generate_transposeGLSL.py
rename to src/glsl/builtins/tools/generate_transposeGLSL.py

diff --git a/builtins/tools/texture_builtins.py b/src/glsl/builtins/tools/texture_builtins.py
similarity index 100%
rename from builtins/tools/texture_builtins.py
rename to src/glsl/builtins/tools/texture_builtins.py

diff --git a/configure.ac b/src/glsl/configure.ac
similarity index 100%
rename from configure.ac
rename to src/glsl/configure.ac

diff --git a/glcpp/.gitignore b/src/glsl/glcpp/.gitignore
similarity index 100%
rename from glcpp/.gitignore
rename to src/glsl/glcpp/.gitignore

diff --git a/glcpp/Makefile.am b/src/glsl/glcpp/Makefile.am
similarity index 100%
rename from glcpp/Makefile.am
rename to src/glsl/glcpp/Makefile.am

diff --git a/glcpp/README b/src/glsl/glcpp/README
similarity index 100%
rename from glcpp/README
rename to src/glsl/glcpp/README

diff --git a/glcpp/glcpp-lex.l b/src/glsl/glcpp/glcpp-lex.l
similarity index 100%
rename from glcpp/glcpp-lex.l
rename to src/glsl/glcpp/glcpp-lex.l

diff --git a/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
similarity index 100%
rename from glcpp/glcpp-parse.y
rename to src/glsl/glcpp/glcpp-parse.y

diff --git a/glcpp/glcpp.c b/src/glsl/glcpp/glcpp.c
similarity index 100%
rename from glcpp/glcpp.c
rename to src/glsl/glcpp/glcpp.c

diff --git a/glcpp/glcpp.h b/src/glsl/glcpp/glcpp.h
similarity index 100%
rename from glcpp/glcpp.h
rename to src/glsl/glcpp/glcpp.h

diff --git a/hash_table.c b/src/glsl/glcpp/hash_table.c
similarity index 100%
rename from hash_table.c
rename to src/glsl/glcpp/hash_table.c

diff --git a/hash_table.h b/src/glsl/glcpp/hash_table.h
similarity index 100%
rename from hash_table.h
rename to src/glsl/glcpp/hash_table.h

diff --git a/main/imports.h b/src/glsl/glcpp/main/imports.h
similarity index 100%
rename from main/imports.h
rename to src/glsl/glcpp/main/imports.h

diff --git a/main/simple_list.h b/src/glsl/glcpp/main/simple_list.h
similarity index 100%
rename from main/simple_list.h
rename to src/glsl/glcpp/main/simple_list.h

diff --git a/glcpp/pp.c b/src/glsl/glcpp/pp.c
similarity index 100%
rename from glcpp/pp.c
rename to src/glsl/glcpp/pp.c

diff --git a/glcpp/tests/000-content-with-spaces.c b/src/glsl/glcpp/tests/000-content-with-spaces.c
similarity index 100%
rename from glcpp/tests/000-content-with-spaces.c
rename to src/glsl/glcpp/tests/000-content-with-spaces.c

diff --git a/glcpp/tests/000-content-with-spaces.c.expected b/src/glsl/glcpp/tests/000-content-with-spaces.c.expected
similarity index 100%
rename from glcpp/tests/000-content-with-spaces.c.expected
rename to src/glsl/glcpp/tests/000-content-with-spaces.c.expected

diff --git a/glcpp/tests/001-define.c b/src/glsl/glcpp/tests/001-define.c
similarity index 100%
rename from glcpp/tests/001-define.c
rename to src/glsl/glcpp/tests/001-define.c

diff --git a/glcpp/tests/001-define.c.expected b/src/glsl/glcpp/tests/001-define.c.expected
similarity index 100%
rename from glcpp/tests/001-define.c.expected
rename to src/glsl/glcpp/tests/001-define.c.expected

diff --git a/glcpp/tests/002-define-chain.c b/src/glsl/glcpp/tests/002-define-chain.c
similarity index 100%
rename from glcpp/tests/002-define-chain.c
rename to src/glsl/glcpp/tests/002-define-chain.c

diff --git a/glcpp/tests/002-define-chain.c.expected b/src/glsl/glcpp/tests/002-define-chain.c.expected
similarity index 100%
rename from glcpp/tests/002-define-chain.c.expected
rename to src/glsl/glcpp/tests/002-define-chain.c.expected

diff --git a/glcpp/tests/003-define-chain-reverse.c b/src/glsl/glcpp/tests/003-define-chain-reverse.c
similarity index 100%
rename from glcpp/tests/003-define-chain-reverse.c
rename to src/glsl/glcpp/tests/003-define-chain-reverse.c

diff --git a/glcpp/tests/003-define-chain-reverse.c.expected b/src/glsl/glcpp/tests/003-define-chain-reverse.c.expected
similarity index 100%
rename from glcpp/tests/003-define-chain-reverse.c.expected
rename to src/glsl/glcpp/tests/003-define-chain-reverse.c.expected

diff --git a/glcpp/tests/004-define-recursive.c b/src/glsl/glcpp/tests/004-define-recursive.c
similarity index 100%
rename from glcpp/tests/004-define-recursive.c
rename to src/glsl/glcpp/tests/004-define-recursive.c

diff --git a/glcpp/tests/004-define-recursive.c.expected b/src/glsl/glcpp/tests/004-define-recursive.c.expected
similarity index 100%
rename from glcpp/tests/004-define-recursive.c.expected
rename to src/glsl/glcpp/tests/004-define-recursive.c.expected

diff --git a/glcpp/tests/005-define-composite-chain.c b/src/glsl/glcpp/tests/005-define-composite-chain.c
similarity index 100%
rename from glcpp/tests/005-define-composite-chain.c
rename to src/glsl/glcpp/tests/005-define-composite-chain.c

diff --git a/glcpp/tests/005-define-composite-chain.c.expected b/src/glsl/glcpp/tests/005-define-composite-chain.c.expected
similarity index 100%
rename from glcpp/tests/005-define-composite-chain.c.expected
rename to src/glsl/glcpp/tests/005-define-composite-chain.c.expected

diff --git a/glcpp/tests/006-define-composite-chain-reverse.c b/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c
similarity index 100%
rename from glcpp/tests/006-define-composite-chain-reverse.c
rename to src/glsl/glcpp/tests/006-define-composite-chain-reverse.c

diff --git a/glcpp/tests/006-define-composite-chain-reverse.c.expected b/src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected
similarity index 100%
rename from glcpp/tests/006-define-composite-chain-reverse.c.expected
rename to src/glsl/glcpp/tests/006-define-composite-chain-reverse.c.expected

diff --git a/glcpp/tests/007-define-composite-recursive.c b/src/glsl/glcpp/tests/007-define-composite-recursive.c
similarity index 100%
rename from glcpp/tests/007-define-composite-recursive.c
rename to src/glsl/glcpp/tests/007-define-composite-recursive.c

diff --git a/glcpp/tests/007-define-composite-recursive.c.expected b/src/glsl/glcpp/tests/007-define-composite-recursive.c.expected
similarity index 100%
rename from glcpp/tests/007-define-composite-recursive.c.expected
rename to src/glsl/glcpp/tests/007-define-composite-recursive.c.expected

diff --git a/glcpp/tests/008-define-empty.c b/src/glsl/glcpp/tests/008-define-empty.c
similarity index 100%
rename from glcpp/tests/008-define-empty.c
rename to src/glsl/glcpp/tests/008-define-empty.c

diff --git a/glcpp/tests/008-define-empty.c.expected b/src/glsl/glcpp/tests/008-define-empty.c.expected
similarity index 100%
rename from glcpp/tests/008-define-empty.c.expected
rename to src/glsl/glcpp/tests/008-define-empty.c.expected

diff --git a/glcpp/tests/009-undef.c b/src/glsl/glcpp/tests/009-undef.c
similarity index 100%
rename from glcpp/tests/009-undef.c
rename to src/glsl/glcpp/tests/009-undef.c

diff --git a/glcpp/tests/009-undef.c.expected b/src/glsl/glcpp/tests/009-undef.c.expected
similarity index 100%
rename from glcpp/tests/009-undef.c.expected
rename to src/glsl/glcpp/tests/009-undef.c.expected

diff --git a/glcpp/tests/010-undef-re-define.c b/src/glsl/glcpp/tests/010-undef-re-define.c
similarity index 100%
rename from glcpp/tests/010-undef-re-define.c
rename to src/glsl/glcpp/tests/010-undef-re-define.c

diff --git a/glcpp/tests/010-undef-re-define.c.expected b/src/glsl/glcpp/tests/010-undef-re-define.c.expected
similarity index 100%
rename from glcpp/tests/010-undef-re-define.c.expected
rename to src/glsl/glcpp/tests/010-undef-re-define.c.expected

diff --git a/glcpp/tests/011-define-func-empty.c b/src/glsl/glcpp/tests/011-define-func-empty.c
similarity index 100%
rename from glcpp/tests/011-define-func-empty.c
rename to src/glsl/glcpp/tests/011-define-func-empty.c

diff --git a/glcpp/tests/011-define-func-empty.c.expected b/src/glsl/glcpp/tests/011-define-func-empty.c.expected
similarity index 100%
rename from glcpp/tests/011-define-func-empty.c.expected
rename to src/glsl/glcpp/tests/011-define-func-empty.c.expected

diff --git a/glcpp/tests/012-define-func-no-args.c b/src/glsl/glcpp/tests/012-define-func-no-args.c
similarity index 100%
rename from glcpp/tests/012-define-func-no-args.c
rename to src/glsl/glcpp/tests/012-define-func-no-args.c

diff --git a/glcpp/tests/012-define-func-no-args.c.expected b/src/glsl/glcpp/tests/012-define-func-no-args.c.expected
similarity index 100%
rename from glcpp/tests/012-define-func-no-args.c.expected
rename to src/glsl/glcpp/tests/012-define-func-no-args.c.expected

diff --git a/glcpp/tests/013-define-func-1-arg-unused.c b/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c
similarity index 100%
rename from glcpp/tests/013-define-func-1-arg-unused.c
rename to src/glsl/glcpp/tests/013-define-func-1-arg-unused.c

diff --git a/glcpp/tests/013-define-func-1-arg-unused.c.expected b/src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected
similarity index 100%
rename from glcpp/tests/013-define-func-1-arg-unused.c.expected
rename to src/glsl/glcpp/tests/013-define-func-1-arg-unused.c.expected

diff --git a/glcpp/tests/014-define-func-2-arg-unused.c b/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c
similarity index 100%
rename from glcpp/tests/014-define-func-2-arg-unused.c
rename to src/glsl/glcpp/tests/014-define-func-2-arg-unused.c

diff --git a/glcpp/tests/014-define-func-2-arg-unused.c.expected b/src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected
similarity index 100%
rename from glcpp/tests/014-define-func-2-arg-unused.c.expected
rename to src/glsl/glcpp/tests/014-define-func-2-arg-unused.c.expected

diff --git a/glcpp/tests/015-define-object-with-parens.c b/src/glsl/glcpp/tests/015-define-object-with-parens.c
similarity index 100%
rename from glcpp/tests/015-define-object-with-parens.c
rename to src/glsl/glcpp/tests/015-define-object-with-parens.c

diff --git a/glcpp/tests/015-define-object-with-parens.c.expected b/src/glsl/glcpp/tests/015-define-object-with-parens.c.expected
similarity index 100%
rename from glcpp/tests/015-define-object-with-parens.c.expected
rename to src/glsl/glcpp/tests/015-define-object-with-parens.c.expected

diff --git a/glcpp/tests/016-define-func-1-arg.c b/src/glsl/glcpp/tests/016-define-func-1-arg.c
similarity index 100%
rename from glcpp/tests/016-define-func-1-arg.c
rename to src/glsl/glcpp/tests/016-define-func-1-arg.c

diff --git a/glcpp/tests/016-define-func-1-arg.c.expected b/src/glsl/glcpp/tests/016-define-func-1-arg.c.expected
similarity index 100%
rename from glcpp/tests/016-define-func-1-arg.c.expected
rename to src/glsl/glcpp/tests/016-define-func-1-arg.c.expected

diff --git a/glcpp/tests/017-define-func-2-args.c b/src/glsl/glcpp/tests/017-define-func-2-args.c
similarity index 100%
rename from glcpp/tests/017-define-func-2-args.c
rename to src/glsl/glcpp/tests/017-define-func-2-args.c

diff --git a/glcpp/tests/017-define-func-2-args.c.expected b/src/glsl/glcpp/tests/017-define-func-2-args.c.expected
similarity index 100%
rename from glcpp/tests/017-define-func-2-args.c.expected
rename to src/glsl/glcpp/tests/017-define-func-2-args.c.expected

diff --git a/glcpp/tests/018-define-func-macro-as-parameter.c b/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c
similarity index 100%
rename from glcpp/tests/018-define-func-macro-as-parameter.c
rename to src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c

diff --git a/glcpp/tests/018-define-func-macro-as-parameter.c.expected b/src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected
similarity index 100%
rename from glcpp/tests/018-define-func-macro-as-parameter.c.expected
rename to src/glsl/glcpp/tests/018-define-func-macro-as-parameter.c.expected

diff --git a/glcpp/tests/019-define-func-1-arg-multi.c b/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c
similarity index 100%
rename from glcpp/tests/019-define-func-1-arg-multi.c
rename to src/glsl/glcpp/tests/019-define-func-1-arg-multi.c

diff --git a/glcpp/tests/019-define-func-1-arg-multi.c.expected b/src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected
similarity index 100%
rename from glcpp/tests/019-define-func-1-arg-multi.c.expected
rename to src/glsl/glcpp/tests/019-define-func-1-arg-multi.c.expected

diff --git a/glcpp/tests/020-define-func-2-arg-multi.c b/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c
similarity index 100%
rename from glcpp/tests/020-define-func-2-arg-multi.c
rename to src/glsl/glcpp/tests/020-define-func-2-arg-multi.c

diff --git a/glcpp/tests/020-define-func-2-arg-multi.c.expected b/src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected
similarity index 100%
rename from glcpp/tests/020-define-func-2-arg-multi.c.expected
rename to src/glsl/glcpp/tests/020-define-func-2-arg-multi.c.expected

diff --git a/glcpp/tests/021-define-func-compose.c b/src/glsl/glcpp/tests/021-define-func-compose.c
similarity index 100%
rename from glcpp/tests/021-define-func-compose.c
rename to src/glsl/glcpp/tests/021-define-func-compose.c

diff --git a/glcpp/tests/021-define-func-compose.c.expected b/src/glsl/glcpp/tests/021-define-func-compose.c.expected
similarity index 100%
rename from glcpp/tests/021-define-func-compose.c.expected
rename to src/glsl/glcpp/tests/021-define-func-compose.c.expected

diff --git a/glcpp/tests/022-define-func-arg-with-parens.c b/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c
similarity index 100%
rename from glcpp/tests/022-define-func-arg-with-parens.c
rename to src/glsl/glcpp/tests/022-define-func-arg-with-parens.c

diff --git a/glcpp/tests/022-define-func-arg-with-parens.c.expected b/src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected
similarity index 100%
rename from glcpp/tests/022-define-func-arg-with-parens.c.expected
rename to src/glsl/glcpp/tests/022-define-func-arg-with-parens.c.expected

diff --git a/glcpp/tests/023-define-extra-whitespace.c b/src/glsl/glcpp/tests/023-define-extra-whitespace.c
similarity index 100%
rename from glcpp/tests/023-define-extra-whitespace.c
rename to src/glsl/glcpp/tests/023-define-extra-whitespace.c

diff --git a/glcpp/tests/023-define-extra-whitespace.c.expected b/src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected
similarity index 100%
rename from glcpp/tests/023-define-extra-whitespace.c.expected
rename to src/glsl/glcpp/tests/023-define-extra-whitespace.c.expected

diff --git a/glcpp/tests/024-define-chain-to-self-recursion.c b/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c
similarity index 100%
rename from glcpp/tests/024-define-chain-to-self-recursion.c
rename to src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c

diff --git a/glcpp/tests/024-define-chain-to-self-recursion.c.expected b/src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected
similarity index 100%
rename from glcpp/tests/024-define-chain-to-self-recursion.c.expected
rename to src/glsl/glcpp/tests/024-define-chain-to-self-recursion.c.expected

diff --git a/glcpp/tests/025-func-macro-as-non-macro.c b/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c
similarity index 100%
rename from glcpp/tests/025-func-macro-as-non-macro.c
rename to src/glsl/glcpp/tests/025-func-macro-as-non-macro.c

diff --git a/glcpp/tests/025-func-macro-as-non-macro.c.expected b/src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected
similarity index 100%
rename from glcpp/tests/025-func-macro-as-non-macro.c.expected
rename to src/glsl/glcpp/tests/025-func-macro-as-non-macro.c.expected

diff --git a/glcpp/tests/026-define-func-extra-newlines.c b/src/glsl/glcpp/tests/026-define-func-extra-newlines.c
similarity index 100%
rename from glcpp/tests/026-define-func-extra-newlines.c
rename to src/glsl/glcpp/tests/026-define-func-extra-newlines.c

diff --git a/glcpp/tests/026-define-func-extra-newlines.c.expected b/src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected
similarity index 100%
rename from glcpp/tests/026-define-func-extra-newlines.c.expected
rename to src/glsl/glcpp/tests/026-define-func-extra-newlines.c.expected

diff --git a/glcpp/tests/027-define-chain-obj-to-func.c b/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c
similarity index 100%
rename from glcpp/tests/027-define-chain-obj-to-func.c
rename to src/glsl/glcpp/tests/027-define-chain-obj-to-func.c

diff --git a/glcpp/tests/027-define-chain-obj-to-func.c.expected b/src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected
similarity index 100%
rename from glcpp/tests/027-define-chain-obj-to-func.c.expected
rename to src/glsl/glcpp/tests/027-define-chain-obj-to-func.c.expected

diff --git a/glcpp/tests/028-define-chain-obj-to-non-func.c b/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c
similarity index 100%
rename from glcpp/tests/028-define-chain-obj-to-non-func.c
rename to src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c

diff --git a/glcpp/tests/028-define-chain-obj-to-non-func.c.expected b/src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected
similarity index 100%
rename from glcpp/tests/028-define-chain-obj-to-non-func.c.expected
rename to src/glsl/glcpp/tests/028-define-chain-obj-to-non-func.c.expected

diff --git a/glcpp/tests/029-define-chain-obj-to-func-with-args.c b/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c
similarity index 100%
rename from glcpp/tests/029-define-chain-obj-to-func-with-args.c
rename to src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c

diff --git a/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected b/src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected
similarity index 100%
rename from glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected
rename to src/glsl/glcpp/tests/029-define-chain-obj-to-func-with-args.c.expected

diff --git a/glcpp/tests/030-define-chain-obj-to-func-compose.c b/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c
similarity index 100%
rename from glcpp/tests/030-define-chain-obj-to-func-compose.c
rename to src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c

diff --git a/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected b/src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected
similarity index 100%
rename from glcpp/tests/030-define-chain-obj-to-func-compose.c.expected
rename to src/glsl/glcpp/tests/030-define-chain-obj-to-func-compose.c.expected

diff --git a/glcpp/tests/031-define-chain-func-to-func-compose.c b/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c
similarity index 100%
rename from glcpp/tests/031-define-chain-func-to-func-compose.c
rename to src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c

diff --git a/glcpp/tests/031-define-chain-func-to-func-compose.c.expected b/src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected
similarity index 100%
rename from glcpp/tests/031-define-chain-func-to-func-compose.c.expected
rename to src/glsl/glcpp/tests/031-define-chain-func-to-func-compose.c.expected

diff --git a/glcpp/tests/032-define-func-self-recurse.c b/src/glsl/glcpp/tests/032-define-func-self-recurse.c
similarity index 100%
rename from glcpp/tests/032-define-func-self-recurse.c
rename to src/glsl/glcpp/tests/032-define-func-self-recurse.c

diff --git a/glcpp/tests/032-define-func-self-recurse.c.expected b/src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected
similarity index 100%
rename from glcpp/tests/032-define-func-self-recurse.c.expected
rename to src/glsl/glcpp/tests/032-define-func-self-recurse.c.expected

diff --git a/glcpp/tests/033-define-func-self-compose.c b/src/glsl/glcpp/tests/033-define-func-self-compose.c
similarity index 100%
rename from glcpp/tests/033-define-func-self-compose.c
rename to src/glsl/glcpp/tests/033-define-func-self-compose.c

diff --git a/glcpp/tests/033-define-func-self-compose.c.expected b/src/glsl/glcpp/tests/033-define-func-self-compose.c.expected
similarity index 100%
rename from glcpp/tests/033-define-func-self-compose.c.expected
rename to src/glsl/glcpp/tests/033-define-func-self-compose.c.expected

diff --git a/glcpp/tests/034-define-func-self-compose-non-func.c b/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c
similarity index 100%
rename from glcpp/tests/034-define-func-self-compose-non-func.c
rename to src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c

diff --git a/glcpp/tests/034-define-func-self-compose-non-func.c.expected b/src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected
similarity index 100%
rename from glcpp/tests/034-define-func-self-compose-non-func.c.expected
rename to src/glsl/glcpp/tests/034-define-func-self-compose-non-func.c.expected

diff --git a/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c b/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c
similarity index 100%
rename from glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c
rename to src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c

diff --git a/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected b/src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected
similarity index 100%
rename from glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected
rename to src/glsl/glcpp/tests/035-define-func-self-compose-non-func-multi-token-argument.c.expected

diff --git a/glcpp/tests/036-define-func-non-macro-multi-token-argument.c b/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c
similarity index 100%
rename from glcpp/tests/036-define-func-non-macro-multi-token-argument.c
rename to src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c

diff --git a/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected b/src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected
similarity index 100%
rename from glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected
rename to src/glsl/glcpp/tests/036-define-func-non-macro-multi-token-argument.c.expected

diff --git a/glcpp/tests/037-finalize-unexpanded-macro.c b/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c
similarity index 100%
rename from glcpp/tests/037-finalize-unexpanded-macro.c
rename to src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c

diff --git a/glcpp/tests/037-finalize-unexpanded-macro.c.expected b/src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected
similarity index 100%
rename from glcpp/tests/037-finalize-unexpanded-macro.c.expected
rename to src/glsl/glcpp/tests/037-finalize-unexpanded-macro.c.expected

diff --git a/glcpp/tests/038-func-arg-with-commas.c b/src/glsl/glcpp/tests/038-func-arg-with-commas.c
similarity index 100%
rename from glcpp/tests/038-func-arg-with-commas.c
rename to src/glsl/glcpp/tests/038-func-arg-with-commas.c

diff --git a/glcpp/tests/038-func-arg-with-commas.c.expected b/src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected
similarity index 100%
rename from glcpp/tests/038-func-arg-with-commas.c.expected
rename to src/glsl/glcpp/tests/038-func-arg-with-commas.c.expected

diff --git a/glcpp/tests/039-func-arg-obj-macro-with-comma.c b/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c
similarity index 100%
rename from glcpp/tests/039-func-arg-obj-macro-with-comma.c
rename to src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c

diff --git a/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected b/src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected
similarity index 100%
rename from glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected
rename to src/glsl/glcpp/tests/039-func-arg-obj-macro-with-comma.c.expected

diff --git a/glcpp/tests/040-token-pasting.c b/src/glsl/glcpp/tests/040-token-pasting.c
similarity index 100%
rename from glcpp/tests/040-token-pasting.c
rename to src/glsl/glcpp/tests/040-token-pasting.c

diff --git a/glcpp/tests/040-token-pasting.c.expected b/src/glsl/glcpp/tests/040-token-pasting.c.expected
similarity index 100%
rename from glcpp/tests/040-token-pasting.c.expected
rename to src/glsl/glcpp/tests/040-token-pasting.c.expected

diff --git a/glcpp/tests/041-if-0.c b/src/glsl/glcpp/tests/041-if-0.c
similarity index 100%
rename from glcpp/tests/041-if-0.c
rename to src/glsl/glcpp/tests/041-if-0.c

diff --git a/glcpp/tests/041-if-0.c.expected b/src/glsl/glcpp/tests/041-if-0.c.expected
similarity index 100%
rename from glcpp/tests/041-if-0.c.expected
rename to src/glsl/glcpp/tests/041-if-0.c.expected

diff --git a/glcpp/tests/042-if-1.c b/src/glsl/glcpp/tests/042-if-1.c
similarity index 100%
rename from glcpp/tests/042-if-1.c
rename to src/glsl/glcpp/tests/042-if-1.c

diff --git a/glcpp/tests/042-if-1.c.expected b/src/glsl/glcpp/tests/042-if-1.c.expected
similarity index 100%
rename from glcpp/tests/042-if-1.c.expected
rename to src/glsl/glcpp/tests/042-if-1.c.expected

diff --git a/glcpp/tests/043-if-0-else.c b/src/glsl/glcpp/tests/043-if-0-else.c
similarity index 100%
rename from glcpp/tests/043-if-0-else.c
rename to src/glsl/glcpp/tests/043-if-0-else.c

diff --git a/glcpp/tests/043-if-0-else.c.expected b/src/glsl/glcpp/tests/043-if-0-else.c.expected
similarity index 100%
rename from glcpp/tests/043-if-0-else.c.expected
rename to src/glsl/glcpp/tests/043-if-0-else.c.expected

diff --git a/glcpp/tests/044-if-1-else.c b/src/glsl/glcpp/tests/044-if-1-else.c
similarity index 100%
rename from glcpp/tests/044-if-1-else.c
rename to src/glsl/glcpp/tests/044-if-1-else.c

diff --git a/glcpp/tests/044-if-1-else.c.expected b/src/glsl/glcpp/tests/044-if-1-else.c.expected
similarity index 100%
rename from glcpp/tests/044-if-1-else.c.expected
rename to src/glsl/glcpp/tests/044-if-1-else.c.expected

diff --git a/glcpp/tests/045-if-0-elif.c b/src/glsl/glcpp/tests/045-if-0-elif.c
similarity index 100%
rename from glcpp/tests/045-if-0-elif.c
rename to src/glsl/glcpp/tests/045-if-0-elif.c

diff --git a/glcpp/tests/045-if-0-elif.c.expected b/src/glsl/glcpp/tests/045-if-0-elif.c.expected
similarity index 100%
rename from glcpp/tests/045-if-0-elif.c.expected
rename to src/glsl/glcpp/tests/045-if-0-elif.c.expected

diff --git a/glcpp/tests/046-if-1-elsif.c b/src/glsl/glcpp/tests/046-if-1-elsif.c
similarity index 100%
rename from glcpp/tests/046-if-1-elsif.c
rename to src/glsl/glcpp/tests/046-if-1-elsif.c

diff --git a/glcpp/tests/046-if-1-elsif.c.expected b/src/glsl/glcpp/tests/046-if-1-elsif.c.expected
similarity index 100%
rename from glcpp/tests/046-if-1-elsif.c.expected
rename to src/glsl/glcpp/tests/046-if-1-elsif.c.expected

diff --git a/glcpp/tests/047-if-elif-else.c b/src/glsl/glcpp/tests/047-if-elif-else.c
similarity index 100%
rename from glcpp/tests/047-if-elif-else.c
rename to src/glsl/glcpp/tests/047-if-elif-else.c

diff --git a/glcpp/tests/047-if-elif-else.c.expected b/src/glsl/glcpp/tests/047-if-elif-else.c.expected
similarity index 100%
rename from glcpp/tests/047-if-elif-else.c.expected
rename to src/glsl/glcpp/tests/047-if-elif-else.c.expected

diff --git a/glcpp/tests/048-if-nested.c b/src/glsl/glcpp/tests/048-if-nested.c
similarity index 100%
rename from glcpp/tests/048-if-nested.c
rename to src/glsl/glcpp/tests/048-if-nested.c

diff --git a/glcpp/tests/048-if-nested.c.expected b/src/glsl/glcpp/tests/048-if-nested.c.expected
similarity index 100%
rename from glcpp/tests/048-if-nested.c.expected
rename to src/glsl/glcpp/tests/048-if-nested.c.expected

diff --git a/glcpp/tests/049-if-expression-precedence.c b/src/glsl/glcpp/tests/049-if-expression-precedence.c
similarity index 100%
rename from glcpp/tests/049-if-expression-precedence.c
rename to src/glsl/glcpp/tests/049-if-expression-precedence.c

diff --git a/glcpp/tests/049-if-expression-precedence.c.expected b/src/glsl/glcpp/tests/049-if-expression-precedence.c.expected
similarity index 100%
rename from glcpp/tests/049-if-expression-precedence.c.expected
rename to src/glsl/glcpp/tests/049-if-expression-precedence.c.expected

diff --git a/glcpp/tests/050-if-defined.c b/src/glsl/glcpp/tests/050-if-defined.c
similarity index 100%
rename from glcpp/tests/050-if-defined.c
rename to src/glsl/glcpp/tests/050-if-defined.c

diff --git a/glcpp/tests/050-if-defined.c.expected b/src/glsl/glcpp/tests/050-if-defined.c.expected
similarity index 100%
rename from glcpp/tests/050-if-defined.c.expected
rename to src/glsl/glcpp/tests/050-if-defined.c.expected

diff --git a/glcpp/tests/051-if-relational.c b/src/glsl/glcpp/tests/051-if-relational.c
similarity index 100%
rename from glcpp/tests/051-if-relational.c
rename to src/glsl/glcpp/tests/051-if-relational.c

diff --git a/glcpp/tests/051-if-relational.c.expected b/src/glsl/glcpp/tests/051-if-relational.c.expected
similarity index 100%
rename from glcpp/tests/051-if-relational.c.expected
rename to src/glsl/glcpp/tests/051-if-relational.c.expected

diff --git a/glcpp/tests/052-if-bitwise.c b/src/glsl/glcpp/tests/052-if-bitwise.c
similarity index 100%
rename from glcpp/tests/052-if-bitwise.c
rename to src/glsl/glcpp/tests/052-if-bitwise.c

diff --git a/glcpp/tests/052-if-bitwise.c.expected b/src/glsl/glcpp/tests/052-if-bitwise.c.expected
similarity index 100%
rename from glcpp/tests/052-if-bitwise.c.expected
rename to src/glsl/glcpp/tests/052-if-bitwise.c.expected

diff --git a/glcpp/tests/053-if-divide-and-shift.c b/src/glsl/glcpp/tests/053-if-divide-and-shift.c
similarity index 100%
rename from glcpp/tests/053-if-divide-and-shift.c
rename to src/glsl/glcpp/tests/053-if-divide-and-shift.c

diff --git a/glcpp/tests/053-if-divide-and-shift.c.expected b/src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected
similarity index 100%
rename from glcpp/tests/053-if-divide-and-shift.c.expected
rename to src/glsl/glcpp/tests/053-if-divide-and-shift.c.expected

diff --git a/glcpp/tests/054-if-with-macros.c b/src/glsl/glcpp/tests/054-if-with-macros.c
similarity index 100%
rename from glcpp/tests/054-if-with-macros.c
rename to src/glsl/glcpp/tests/054-if-with-macros.c

diff --git a/glcpp/tests/054-if-with-macros.c.expected b/src/glsl/glcpp/tests/054-if-with-macros.c.expected
similarity index 100%
rename from glcpp/tests/054-if-with-macros.c.expected
rename to src/glsl/glcpp/tests/054-if-with-macros.c.expected

diff --git a/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c b/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c
similarity index 100%
rename from glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c
rename to src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c

diff --git a/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected b/src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected
similarity index 100%
rename from glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected
rename to src/glsl/glcpp/tests/055-define-chain-obj-to-func-parens-in-text.c.expected

diff --git a/glcpp/tests/056-macro-argument-with-comma.c b/src/glsl/glcpp/tests/056-macro-argument-with-comma.c
similarity index 100%
rename from glcpp/tests/056-macro-argument-with-comma.c
rename to src/glsl/glcpp/tests/056-macro-argument-with-comma.c

diff --git a/glcpp/tests/056-macro-argument-with-comma.c.expected b/src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected
similarity index 100%
rename from glcpp/tests/056-macro-argument-with-comma.c.expected
rename to src/glsl/glcpp/tests/056-macro-argument-with-comma.c.expected

diff --git a/glcpp/tests/057-empty-arguments.c b/src/glsl/glcpp/tests/057-empty-arguments.c
similarity index 100%
rename from glcpp/tests/057-empty-arguments.c
rename to src/glsl/glcpp/tests/057-empty-arguments.c

diff --git a/glcpp/tests/057-empty-arguments.c.expected b/src/glsl/glcpp/tests/057-empty-arguments.c.expected
similarity index 100%
rename from glcpp/tests/057-empty-arguments.c.expected
rename to src/glsl/glcpp/tests/057-empty-arguments.c.expected

diff --git a/glcpp/tests/058-token-pasting-empty-arguments.c b/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c
similarity index 100%
rename from glcpp/tests/058-token-pasting-empty-arguments.c
rename to src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c

diff --git a/glcpp/tests/058-token-pasting-empty-arguments.c.expected b/src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected
similarity index 100%
rename from glcpp/tests/058-token-pasting-empty-arguments.c.expected
rename to src/glsl/glcpp/tests/058-token-pasting-empty-arguments.c.expected

diff --git a/glcpp/tests/059-token-pasting-integer.c b/src/glsl/glcpp/tests/059-token-pasting-integer.c
similarity index 100%
rename from glcpp/tests/059-token-pasting-integer.c
rename to src/glsl/glcpp/tests/059-token-pasting-integer.c

diff --git a/glcpp/tests/059-token-pasting-integer.c.expected b/src/glsl/glcpp/tests/059-token-pasting-integer.c.expected
similarity index 100%
rename from glcpp/tests/059-token-pasting-integer.c.expected
rename to src/glsl/glcpp/tests/059-token-pasting-integer.c.expected

diff --git a/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c b/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c
similarity index 100%
rename from glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c
rename to src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c

diff --git a/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected b/src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected
similarity index 100%
rename from glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected
rename to src/glsl/glcpp/tests/060-left-paren-in-macro-right-paren-in-text.c.expected

diff --git a/glcpp/tests/061-define-chain-obj-to-func-multi.c b/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c
similarity index 100%
rename from glcpp/tests/061-define-chain-obj-to-func-multi.c
rename to src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c

diff --git a/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected b/src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected
similarity index 100%
rename from glcpp/tests/061-define-chain-obj-to-func-multi.c.expected
rename to src/glsl/glcpp/tests/061-define-chain-obj-to-func-multi.c.expected

diff --git a/glcpp/tests/062-if-0-skips-garbage.c b/src/glsl/glcpp/tests/062-if-0-skips-garbage.c
similarity index 100%
rename from glcpp/tests/062-if-0-skips-garbage.c
rename to src/glsl/glcpp/tests/062-if-0-skips-garbage.c

diff --git a/glcpp/tests/062-if-0-skips-garbage.c.expected b/src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected
similarity index 100%
rename from glcpp/tests/062-if-0-skips-garbage.c.expected
rename to src/glsl/glcpp/tests/062-if-0-skips-garbage.c.expected

diff --git a/glcpp/tests/063-comments.c b/src/glsl/glcpp/tests/063-comments.c
similarity index 100%
rename from glcpp/tests/063-comments.c
rename to src/glsl/glcpp/tests/063-comments.c

diff --git a/glcpp/tests/063-comments.c.expected b/src/glsl/glcpp/tests/063-comments.c.expected
similarity index 100%
rename from glcpp/tests/063-comments.c.expected
rename to src/glsl/glcpp/tests/063-comments.c.expected

diff --git a/glcpp/tests/064-version.c b/src/glsl/glcpp/tests/064-version.c
similarity index 100%
rename from glcpp/tests/064-version.c
rename to src/glsl/glcpp/tests/064-version.c

diff --git a/glcpp/tests/064-version.c.expected b/src/glsl/glcpp/tests/064-version.c.expected
similarity index 100%
rename from glcpp/tests/064-version.c.expected
rename to src/glsl/glcpp/tests/064-version.c.expected

diff --git a/glcpp/tests/065-if-defined-parens.c b/src/glsl/glcpp/tests/065-if-defined-parens.c
similarity index 100%
rename from glcpp/tests/065-if-defined-parens.c
rename to src/glsl/glcpp/tests/065-if-defined-parens.c

diff --git a/glcpp/tests/065-if-defined-parens.c.expected b/src/glsl/glcpp/tests/065-if-defined-parens.c.expected
similarity index 100%
rename from glcpp/tests/065-if-defined-parens.c.expected
rename to src/glsl/glcpp/tests/065-if-defined-parens.c.expected

diff --git a/glcpp/tests/071-punctuator.c b/src/glsl/glcpp/tests/071-punctuator.c
similarity index 100%
rename from glcpp/tests/071-punctuator.c
rename to src/glsl/glcpp/tests/071-punctuator.c

diff --git a/glcpp/tests/071-punctuator.c.expected b/src/glsl/glcpp/tests/071-punctuator.c.expected
similarity index 100%
rename from glcpp/tests/071-punctuator.c.expected
rename to src/glsl/glcpp/tests/071-punctuator.c.expected

diff --git a/glcpp/tests/072-token-pasting-same-line.c b/src/glsl/glcpp/tests/072-token-pasting-same-line.c
similarity index 100%
rename from glcpp/tests/072-token-pasting-same-line.c
rename to src/glsl/glcpp/tests/072-token-pasting-same-line.c

diff --git a/glcpp/tests/072-token-pasting-same-line.c.expected b/src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected
similarity index 100%
rename from glcpp/tests/072-token-pasting-same-line.c.expected
rename to src/glsl/glcpp/tests/072-token-pasting-same-line.c.expected

diff --git a/glcpp/tests/099-c99-example.c b/src/glsl/glcpp/tests/099-c99-example.c
similarity index 100%
rename from glcpp/tests/099-c99-example.c
rename to src/glsl/glcpp/tests/099-c99-example.c

diff --git a/glcpp/tests/099-c99-example.c.expected b/src/glsl/glcpp/tests/099-c99-example.c.expected
similarity index 100%
rename from glcpp/tests/099-c99-example.c.expected
rename to src/glsl/glcpp/tests/099-c99-example.c.expected

diff --git a/glcpp/tests/glcpp-test b/src/glsl/glcpp/tests/glcpp-test
similarity index 100%
rename from glcpp/tests/glcpp-test
rename to src/glsl/glcpp/tests/glcpp-test

diff --git a/glcpp/xtalloc.c b/src/glsl/glcpp/xtalloc.c
similarity index 100%
rename from glcpp/xtalloc.c
rename to src/glsl/glcpp/xtalloc.c

diff --git a/glsl_lexer.lpp b/src/glsl/glsl_lexer.lpp
similarity index 100%
rename from glsl_lexer.lpp
rename to src/glsl/glsl_lexer.lpp

diff --git a/glsl_parser.ypp b/src/glsl/glsl_parser.ypp
similarity index 100%
rename from glsl_parser.ypp
rename to src/glsl/glsl_parser.ypp

diff --git a/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
similarity index 100%
rename from glsl_parser_extras.cpp
rename to src/glsl/glsl_parser_extras.cpp

diff --git a/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
similarity index 100%
rename from glsl_parser_extras.h
rename to src/glsl/glsl_parser_extras.h

diff --git a/glsl_symbol_table.h b/src/glsl/glsl_symbol_table.h
similarity index 100%
rename from glsl_symbol_table.h
rename to src/glsl/glsl_symbol_table.h

diff --git a/glsl_types.cpp b/src/glsl/glsl_types.cpp
similarity index 100%
rename from glsl_types.cpp
rename to src/glsl/glsl_types.cpp

diff --git a/glsl_types.h b/src/glsl/glsl_types.h
similarity index 100%
rename from glsl_types.h
rename to src/glsl/glsl_types.h

diff --git a/glcpp/hash_table.c b/src/glsl/hash_table.c
similarity index 100%
rename from glcpp/hash_table.c
rename to src/glsl/hash_table.c

diff --git a/glcpp/hash_table.h b/src/glsl/hash_table.h
similarity index 100%
rename from glcpp/hash_table.h
rename to src/glsl/hash_table.h

diff --git a/hir_field_selection.cpp b/src/glsl/hir_field_selection.cpp
similarity index 100%
rename from hir_field_selection.cpp
rename to src/glsl/hir_field_selection.cpp

diff --git a/ir.cpp b/src/glsl/ir.cpp
similarity index 100%
rename from ir.cpp
rename to src/glsl/ir.cpp

diff --git a/ir.h b/src/glsl/ir.h
similarity index 100%
rename from ir.h
rename to src/glsl/ir.h

diff --git a/ir_basic_block.cpp b/src/glsl/ir_basic_block.cpp
similarity index 100%
rename from ir_basic_block.cpp
rename to src/glsl/ir_basic_block.cpp

diff --git a/ir_basic_block.h b/src/glsl/ir_basic_block.h
similarity index 100%
rename from ir_basic_block.h
rename to src/glsl/ir_basic_block.h

diff --git a/ir_clone.cpp b/src/glsl/ir_clone.cpp
similarity index 100%
rename from ir_clone.cpp
rename to src/glsl/ir_clone.cpp

diff --git a/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
similarity index 100%
rename from ir_constant_expression.cpp
rename to src/glsl/ir_constant_expression.cpp

diff --git a/ir_constant_folding.cpp b/src/glsl/ir_constant_folding.cpp
similarity index 100%
rename from ir_constant_folding.cpp
rename to src/glsl/ir_constant_folding.cpp

diff --git a/ir_constant_variable.cpp b/src/glsl/ir_constant_variable.cpp
similarity index 100%
rename from ir_constant_variable.cpp
rename to src/glsl/ir_constant_variable.cpp

diff --git a/ir_copy_propagation.cpp b/src/glsl/ir_copy_propagation.cpp
similarity index 100%
rename from ir_copy_propagation.cpp
rename to src/glsl/ir_copy_propagation.cpp

diff --git a/ir_dead_code.cpp b/src/glsl/ir_dead_code.cpp
similarity index 100%
rename from ir_dead_code.cpp
rename to src/glsl/ir_dead_code.cpp

diff --git a/ir_dead_code_local.cpp b/src/glsl/ir_dead_code_local.cpp
similarity index 100%
rename from ir_dead_code_local.cpp
rename to src/glsl/ir_dead_code_local.cpp

diff --git a/ir_expression_flattening.cpp b/src/glsl/ir_expression_flattening.cpp
similarity index 100%
rename from ir_expression_flattening.cpp
rename to src/glsl/ir_expression_flattening.cpp

diff --git a/ir_expression_flattening.h b/src/glsl/ir_expression_flattening.h
similarity index 100%
rename from ir_expression_flattening.h
rename to src/glsl/ir_expression_flattening.h

diff --git a/ir_function.cpp b/src/glsl/ir_function.cpp
similarity index 100%
rename from ir_function.cpp
rename to src/glsl/ir_function.cpp

diff --git a/ir_function_can_inline.cpp b/src/glsl/ir_function_can_inline.cpp
similarity index 100%
rename from ir_function_can_inline.cpp
rename to src/glsl/ir_function_can_inline.cpp

diff --git a/ir_function_inlining.cpp b/src/glsl/ir_function_inlining.cpp
similarity index 100%
rename from ir_function_inlining.cpp
rename to src/glsl/ir_function_inlining.cpp

diff --git a/ir_function_inlining.h b/src/glsl/ir_function_inlining.h
similarity index 100%
rename from ir_function_inlining.h
rename to src/glsl/ir_function_inlining.h

diff --git a/ir_hierarchical_visitor.cpp b/src/glsl/ir_hierarchical_visitor.cpp
similarity index 100%
rename from ir_hierarchical_visitor.cpp
rename to src/glsl/ir_hierarchical_visitor.cpp

diff --git a/ir_hierarchical_visitor.h b/src/glsl/ir_hierarchical_visitor.h
similarity index 100%
rename from ir_hierarchical_visitor.h
rename to src/glsl/ir_hierarchical_visitor.h

diff --git a/ir_hv_accept.cpp b/src/glsl/ir_hv_accept.cpp
similarity index 100%
rename from ir_hv_accept.cpp
rename to src/glsl/ir_hv_accept.cpp

diff --git a/ir_if_simplification.cpp b/src/glsl/ir_if_simplification.cpp
similarity index 100%
rename from ir_if_simplification.cpp
rename to src/glsl/ir_if_simplification.cpp

diff --git a/ir_optimization.h b/src/glsl/ir_optimization.h
similarity index 100%
rename from ir_optimization.h
rename to src/glsl/ir_optimization.h

diff --git a/ir_print_visitor.cpp b/src/glsl/ir_print_visitor.cpp
similarity index 100%
rename from ir_print_visitor.cpp
rename to src/glsl/ir_print_visitor.cpp

diff --git a/ir_print_visitor.h b/src/glsl/ir_print_visitor.h
similarity index 100%
rename from ir_print_visitor.h
rename to src/glsl/ir_print_visitor.h

diff --git a/ir_reader.cpp b/src/glsl/ir_reader.cpp
similarity index 100%
rename from ir_reader.cpp
rename to src/glsl/ir_reader.cpp

diff --git a/ir_reader.h b/src/glsl/ir_reader.h
similarity index 100%
rename from ir_reader.h
rename to src/glsl/ir_reader.h

diff --git a/ir_swizzle_swizzle.cpp b/src/glsl/ir_swizzle_swizzle.cpp
similarity index 100%
rename from ir_swizzle_swizzle.cpp
rename to src/glsl/ir_swizzle_swizzle.cpp

diff --git a/ir_to_mesa.cpp b/src/glsl/ir_to_mesa.cpp
similarity index 100%
rename from ir_to_mesa.cpp
rename to src/glsl/ir_to_mesa.cpp

diff --git a/ir_validate.cpp b/src/glsl/ir_validate.cpp
similarity index 100%
rename from ir_validate.cpp
rename to src/glsl/ir_validate.cpp

diff --git a/ir_variable.cpp b/src/glsl/ir_variable.cpp
similarity index 100%
rename from ir_variable.cpp
rename to src/glsl/ir_variable.cpp

diff --git a/ir_vec_index_to_swizzle.cpp b/src/glsl/ir_vec_index_to_swizzle.cpp
similarity index 100%
rename from ir_vec_index_to_swizzle.cpp
rename to src/glsl/ir_vec_index_to_swizzle.cpp

diff --git a/ir_visitor.h b/src/glsl/ir_visitor.h
similarity index 100%
rename from ir_visitor.h
rename to src/glsl/ir_visitor.h

diff --git a/linker.cpp b/src/glsl/linker.cpp
similarity index 100%
rename from linker.cpp
rename to src/glsl/linker.cpp

diff --git a/list.h b/src/glsl/list.h
similarity index 100%
rename from list.h
rename to src/glsl/list.h

diff --git a/main.cpp b/src/glsl/main.cpp
similarity index 100%
rename from main.cpp
rename to src/glsl/main.cpp

diff --git a/glcpp/main/imports.h b/src/glsl/main/imports.h
similarity index 100%
rename from glcpp/main/imports.h
rename to src/glsl/main/imports.h

diff --git a/main/mtypes.h b/src/glsl/main/mtypes.h
similarity index 100%
rename from main/mtypes.h
rename to src/glsl/main/mtypes.h

diff --git a/glcpp/main/simple_list.h b/src/glsl/main/simple_list.h
similarity index 100%
rename from glcpp/main/simple_list.h
rename to src/glsl/main/simple_list.h

diff --git a/mesa/shader/prog_instruction.c b/src/glsl/mesa/shader/prog_instruction.c
similarity index 100%
rename from mesa/shader/prog_instruction.c
rename to src/glsl/mesa/shader/prog_instruction.c

diff --git a/mesa/shader/prog_instruction.h b/src/glsl/mesa/shader/prog_instruction.h
similarity index 100%
rename from mesa/shader/prog_instruction.h
rename to src/glsl/mesa/shader/prog_instruction.h

diff --git a/mesa/shader/prog_print.c b/src/glsl/mesa/shader/prog_print.c
similarity index 100%
rename from mesa/shader/prog_print.c
rename to src/glsl/mesa/shader/prog_print.c

diff --git a/mesa/shader/prog_print.h b/src/glsl/mesa/shader/prog_print.h
similarity index 100%
rename from mesa/shader/prog_print.h
rename to src/glsl/mesa/shader/prog_print.h

diff --git a/program.h b/src/glsl/program.h
similarity index 100%
rename from program.h
rename to src/glsl/program.h

diff --git a/s_expression.cpp b/src/glsl/s_expression.cpp
similarity index 100%
rename from s_expression.cpp
rename to src/glsl/s_expression.cpp

diff --git a/s_expression.h b/src/glsl/s_expression.h
similarity index 100%
rename from s_expression.h
rename to src/glsl/s_expression.h

diff --git a/symbol_table.c b/src/glsl/symbol_table.c
similarity index 100%
rename from symbol_table.c
rename to src/glsl/symbol_table.c

diff --git a/symbol_table.h b/src/glsl/symbol_table.h
similarity index 100%
rename from symbol_table.h
rename to src/glsl/symbol_table.h

diff --git a/tests/array-01.glsl b/src/glsl/tests/array-01.glsl
similarity index 100%
rename from tests/array-01.glsl
rename to src/glsl/tests/array-01.glsl

diff --git a/tests/array-02.glsl b/src/glsl/tests/array-02.glsl
similarity index 100%
rename from tests/array-02.glsl
rename to src/glsl/tests/array-02.glsl

diff --git a/tests/array-03.glsl b/src/glsl/tests/array-03.glsl
similarity index 100%
rename from tests/array-03.glsl
rename to src/glsl/tests/array-03.glsl

diff --git a/tests/array-04.glsl b/src/glsl/tests/array-04.glsl
similarity index 100%
rename from tests/array-04.glsl
rename to src/glsl/tests/array-04.glsl

diff --git a/tests/array-05.glsl b/src/glsl/tests/array-05.glsl
similarity index 100%
rename from tests/array-05.glsl
rename to src/glsl/tests/array-05.glsl

diff --git a/tests/array-06.glsl b/src/glsl/tests/array-06.glsl
similarity index 100%
rename from tests/array-06.glsl
rename to src/glsl/tests/array-06.glsl

diff --git a/tests/array-07.glsl b/src/glsl/tests/array-07.glsl
similarity index 100%
rename from tests/array-07.glsl
rename to src/glsl/tests/array-07.glsl

diff --git a/tests/array-08.glsl b/src/glsl/tests/array-08.glsl
similarity index 100%
rename from tests/array-08.glsl
rename to src/glsl/tests/array-08.glsl

diff --git a/tests/array-09.glsl b/src/glsl/tests/array-09.glsl
similarity index 100%
rename from tests/array-09.glsl
rename to src/glsl/tests/array-09.glsl

diff --git a/tests/array-10.glsl b/src/glsl/tests/array-10.glsl
similarity index 100%
rename from tests/array-10.glsl
rename to src/glsl/tests/array-10.glsl

diff --git a/tests/array-11.glsl b/src/glsl/tests/array-11.glsl
similarity index 100%
rename from tests/array-11.glsl
rename to src/glsl/tests/array-11.glsl

diff --git a/tests/array-12.glsl b/src/glsl/tests/array-12.glsl
similarity index 100%
rename from tests/array-12.glsl
rename to src/glsl/tests/array-12.glsl

diff --git a/tests/array-13.glsl b/src/glsl/tests/array-13.glsl
similarity index 100%
rename from tests/array-13.glsl
rename to src/glsl/tests/array-13.glsl

diff --git a/tests/attribute-01.glsl b/src/glsl/tests/attribute-01.glsl
similarity index 100%
rename from tests/attribute-01.glsl
rename to src/glsl/tests/attribute-01.glsl

diff --git a/tests/attribute-02.glsl b/src/glsl/tests/attribute-02.glsl
similarity index 100%
rename from tests/attribute-02.glsl
rename to src/glsl/tests/attribute-02.glsl

diff --git a/tests/attribute-03.glsl b/src/glsl/tests/attribute-03.glsl
similarity index 100%
rename from tests/attribute-03.glsl
rename to src/glsl/tests/attribute-03.glsl

diff --git a/tests/attribute-04.glsl b/src/glsl/tests/attribute-04.glsl
similarity index 100%
rename from tests/attribute-04.glsl
rename to src/glsl/tests/attribute-04.glsl

diff --git a/tests/attribute-05.glsl b/src/glsl/tests/attribute-05.glsl
similarity index 100%
rename from tests/attribute-05.glsl
rename to src/glsl/tests/attribute-05.glsl

diff --git a/tests/attribute-06.glsl b/src/glsl/tests/attribute-06.glsl
similarity index 100%
rename from tests/attribute-06.glsl
rename to src/glsl/tests/attribute-06.glsl

diff --git a/tests/attribute-07.glsl b/src/glsl/tests/attribute-07.glsl
similarity index 100%
rename from tests/attribute-07.glsl
rename to src/glsl/tests/attribute-07.glsl

diff --git a/tests/attribute-08.glsl b/src/glsl/tests/attribute-08.glsl
similarity index 100%
rename from tests/attribute-08.glsl
rename to src/glsl/tests/attribute-08.glsl

diff --git a/tests/attribute-09.glsl b/src/glsl/tests/attribute-09.glsl
similarity index 100%
rename from tests/attribute-09.glsl
rename to src/glsl/tests/attribute-09.glsl

diff --git a/tests/attribute-10.glsl b/src/glsl/tests/attribute-10.glsl
similarity index 100%
rename from tests/attribute-10.glsl
rename to src/glsl/tests/attribute-10.glsl

diff --git a/tests/attribute-11.glsl b/src/glsl/tests/attribute-11.glsl
similarity index 100%
rename from tests/attribute-11.glsl
rename to src/glsl/tests/attribute-11.glsl

diff --git a/tests/condition-01.glsl b/src/glsl/tests/condition-01.glsl
similarity index 100%
rename from tests/condition-01.glsl
rename to src/glsl/tests/condition-01.glsl

diff --git a/tests/condition-02.glsl b/src/glsl/tests/condition-02.glsl
similarity index 100%
rename from tests/condition-02.glsl
rename to src/glsl/tests/condition-02.glsl

diff --git a/tests/condition-03.glsl b/src/glsl/tests/condition-03.glsl
similarity index 100%
rename from tests/condition-03.glsl
rename to src/glsl/tests/condition-03.glsl

diff --git a/tests/condition-04.glsl b/src/glsl/tests/condition-04.glsl
similarity index 100%
rename from tests/condition-04.glsl
rename to src/glsl/tests/condition-04.glsl

diff --git a/tests/condition-05.glsl b/src/glsl/tests/condition-05.glsl
similarity index 100%
rename from tests/condition-05.glsl
rename to src/glsl/tests/condition-05.glsl

diff --git a/tests/constructor-01.glsl b/src/glsl/tests/constructor-01.glsl
similarity index 100%
rename from tests/constructor-01.glsl
rename to src/glsl/tests/constructor-01.glsl

diff --git a/tests/constructor-02.glsl b/src/glsl/tests/constructor-02.glsl
similarity index 100%
rename from tests/constructor-02.glsl
rename to src/glsl/tests/constructor-02.glsl

diff --git a/tests/constructor-03.glsl b/src/glsl/tests/constructor-03.glsl
similarity index 100%
rename from tests/constructor-03.glsl
rename to src/glsl/tests/constructor-03.glsl

diff --git a/tests/constructor-04.glsl b/src/glsl/tests/constructor-04.glsl
similarity index 100%
rename from tests/constructor-04.glsl
rename to src/glsl/tests/constructor-04.glsl

diff --git a/tests/constructor-05.glsl b/src/glsl/tests/constructor-05.glsl
similarity index 100%
rename from tests/constructor-05.glsl
rename to src/glsl/tests/constructor-05.glsl

diff --git a/tests/constructor-06.glsl b/src/glsl/tests/constructor-06.glsl
similarity index 100%
rename from tests/constructor-06.glsl
rename to src/glsl/tests/constructor-06.glsl

diff --git a/tests/constructor-07.glsl b/src/glsl/tests/constructor-07.glsl
similarity index 100%
rename from tests/constructor-07.glsl
rename to src/glsl/tests/constructor-07.glsl

diff --git a/tests/constructor-08.glsl b/src/glsl/tests/constructor-08.glsl
similarity index 100%
rename from tests/constructor-08.glsl
rename to src/glsl/tests/constructor-08.glsl

diff --git a/tests/constructor-09.glsl b/src/glsl/tests/constructor-09.glsl
similarity index 100%
rename from tests/constructor-09.glsl
rename to src/glsl/tests/constructor-09.glsl

diff --git a/tests/function-01.glsl b/src/glsl/tests/function-01.glsl
similarity index 100%
rename from tests/function-01.glsl
rename to src/glsl/tests/function-01.glsl

diff --git a/tests/function-02.glsl b/src/glsl/tests/function-02.glsl
similarity index 100%
rename from tests/function-02.glsl
rename to src/glsl/tests/function-02.glsl

diff --git a/tests/function-03.glsl b/src/glsl/tests/function-03.glsl
similarity index 100%
rename from tests/function-03.glsl
rename to src/glsl/tests/function-03.glsl

diff --git a/tests/function-04.glsl b/src/glsl/tests/function-04.glsl
similarity index 100%
rename from tests/function-04.glsl
rename to src/glsl/tests/function-04.glsl

diff --git a/tests/function-05.glsl b/src/glsl/tests/function-05.glsl
similarity index 100%
rename from tests/function-05.glsl
rename to src/glsl/tests/function-05.glsl

diff --git a/tests/if-01.glsl b/src/glsl/tests/if-01.glsl
similarity index 100%
rename from tests/if-01.glsl
rename to src/glsl/tests/if-01.glsl

diff --git a/tests/if-02.glsl b/src/glsl/tests/if-02.glsl
similarity index 100%
rename from tests/if-02.glsl
rename to src/glsl/tests/if-02.glsl

diff --git a/tests/if-03.glsl b/src/glsl/tests/if-03.glsl
similarity index 100%
rename from tests/if-03.glsl
rename to src/glsl/tests/if-03.glsl

diff --git a/tests/if-04.glsl b/src/glsl/tests/if-04.glsl
similarity index 100%
rename from tests/if-04.glsl
rename to src/glsl/tests/if-04.glsl

diff --git a/tests/matrix-01.glsl b/src/glsl/tests/matrix-01.glsl
similarity index 100%
rename from tests/matrix-01.glsl
rename to src/glsl/tests/matrix-01.glsl

diff --git a/tests/matrix-02.glsl b/src/glsl/tests/matrix-02.glsl
similarity index 100%
rename from tests/matrix-02.glsl
rename to src/glsl/tests/matrix-02.glsl

diff --git a/tests/matrix-03.glsl b/src/glsl/tests/matrix-03.glsl
similarity index 100%
rename from tests/matrix-03.glsl
rename to src/glsl/tests/matrix-03.glsl

diff --git a/tests/matrix-04.glsl b/src/glsl/tests/matrix-04.glsl
similarity index 100%
rename from tests/matrix-04.glsl
rename to src/glsl/tests/matrix-04.glsl

diff --git a/tests/matrix-05.glsl b/src/glsl/tests/matrix-05.glsl
similarity index 100%
rename from tests/matrix-05.glsl
rename to src/glsl/tests/matrix-05.glsl

diff --git a/tests/matrix-06.glsl b/src/glsl/tests/matrix-06.glsl
similarity index 100%
rename from tests/matrix-06.glsl
rename to src/glsl/tests/matrix-06.glsl

diff --git a/tests/matrix-07.glsl b/src/glsl/tests/matrix-07.glsl
similarity index 100%
rename from tests/matrix-07.glsl
rename to src/glsl/tests/matrix-07.glsl

diff --git a/tests/matrix-08.glsl b/src/glsl/tests/matrix-08.glsl
similarity index 100%
rename from tests/matrix-08.glsl
rename to src/glsl/tests/matrix-08.glsl

diff --git a/tests/matrix-09.glsl b/src/glsl/tests/matrix-09.glsl
similarity index 100%
rename from tests/matrix-09.glsl
rename to src/glsl/tests/matrix-09.glsl

diff --git a/tests/matrix-10.glsl b/src/glsl/tests/matrix-10.glsl
similarity index 100%
rename from tests/matrix-10.glsl
rename to src/glsl/tests/matrix-10.glsl

diff --git a/tests/parameters-01.glsl b/src/glsl/tests/parameters-01.glsl
similarity index 100%
rename from tests/parameters-01.glsl
rename to src/glsl/tests/parameters-01.glsl

diff --git a/tests/parameters-02.glsl b/src/glsl/tests/parameters-02.glsl
similarity index 100%
rename from tests/parameters-02.glsl
rename to src/glsl/tests/parameters-02.glsl

diff --git a/tests/parameters-03.glsl b/src/glsl/tests/parameters-03.glsl
similarity index 100%
rename from tests/parameters-03.glsl
rename to src/glsl/tests/parameters-03.glsl

diff --git a/tests/qualifier-01.glsl b/src/glsl/tests/qualifier-01.glsl
similarity index 100%
rename from tests/qualifier-01.glsl
rename to src/glsl/tests/qualifier-01.glsl

diff --git a/tests/qualifier-02.glsl b/src/glsl/tests/qualifier-02.glsl
similarity index 100%
rename from tests/qualifier-02.glsl
rename to src/glsl/tests/qualifier-02.glsl

diff --git a/tests/qualifier-03.glsl b/src/glsl/tests/qualifier-03.glsl
similarity index 100%
rename from tests/qualifier-03.glsl
rename to src/glsl/tests/qualifier-03.glsl

diff --git a/tests/qualifier-04.glsl b/src/glsl/tests/qualifier-04.glsl
similarity index 100%
rename from tests/qualifier-04.glsl
rename to src/glsl/tests/qualifier-04.glsl

diff --git a/tests/qualifier-05.glsl b/src/glsl/tests/qualifier-05.glsl
similarity index 100%
rename from tests/qualifier-05.glsl
rename to src/glsl/tests/qualifier-05.glsl

diff --git a/tests/qualifier-06.glsl b/src/glsl/tests/qualifier-06.glsl
similarity index 100%
rename from tests/qualifier-06.glsl
rename to src/glsl/tests/qualifier-06.glsl

diff --git a/tests/qualifier-07.glsl b/src/glsl/tests/qualifier-07.glsl
similarity index 100%
rename from tests/qualifier-07.glsl
rename to src/glsl/tests/qualifier-07.glsl

diff --git a/tests/swiz-01.glsl b/src/glsl/tests/swiz-01.glsl
similarity index 100%
rename from tests/swiz-01.glsl
rename to src/glsl/tests/swiz-01.glsl

diff --git a/tests/swiz-02.glsl b/src/glsl/tests/swiz-02.glsl
similarity index 100%
rename from tests/swiz-02.glsl
rename to src/glsl/tests/swiz-02.glsl

diff --git a/tests/void-01.glsl b/src/glsl/tests/void-01.glsl
similarity index 100%
rename from tests/void-01.glsl
rename to src/glsl/tests/void-01.glsl