diff --git a/samples/angle/hello_triangle/HelloTriangle.cpp b/samples/hello_triangle/HelloTriangle.cpp
similarity index 100%
rename from samples/angle/hello_triangle/HelloTriangle.cpp
rename to samples/hello_triangle/HelloTriangle.cpp
diff --git a/samples/angle/mip_map_2d/MipMap2D.cpp b/samples/mip_map_2d/MipMap2D.cpp
similarity index 100%
rename from samples/angle/mip_map_2d/MipMap2D.cpp
rename to samples/mip_map_2d/MipMap2D.cpp
diff --git a/samples/angle/multi_texture/MultiTexture.cpp b/samples/multi_texture/MultiTexture.cpp
similarity index 100%
rename from samples/angle/multi_texture/MultiTexture.cpp
rename to samples/multi_texture/MultiTexture.cpp
diff --git a/samples/angle/multi_texture/basemap.tga b/samples/multi_texture/basemap.tga
similarity index 100%
rename from samples/angle/multi_texture/basemap.tga
rename to samples/multi_texture/basemap.tga
diff --git a/samples/angle/multi_texture/lightmap.tga b/samples/multi_texture/lightmap.tga
similarity index 100%
rename from samples/angle/multi_texture/lightmap.tga
rename to samples/multi_texture/lightmap.tga
diff --git a/samples/angle/multiple_draw_buffers/MultipleDrawBuffers.cpp b/samples/multiple_draw_buffers/MultipleDrawBuffers.cpp
similarity index 100%
rename from samples/angle/multiple_draw_buffers/MultipleDrawBuffers.cpp
rename to samples/multiple_draw_buffers/MultipleDrawBuffers.cpp
diff --git a/samples/angle/multiple_draw_buffers/multiple_draw_buffers_copy_fs.glsl b/samples/multiple_draw_buffers/multiple_draw_buffers_copy_fs.glsl
similarity index 100%
rename from samples/angle/multiple_draw_buffers/multiple_draw_buffers_copy_fs.glsl
rename to samples/multiple_draw_buffers/multiple_draw_buffers_copy_fs.glsl
diff --git a/samples/angle/multiple_draw_buffers/multiple_draw_buffers_fs.glsl b/samples/multiple_draw_buffers/multiple_draw_buffers_fs.glsl
similarity index 100%
rename from samples/angle/multiple_draw_buffers/multiple_draw_buffers_fs.glsl
rename to samples/multiple_draw_buffers/multiple_draw_buffers_fs.glsl
diff --git a/samples/angle/multiple_draw_buffers/multiple_draw_buffers_vs.glsl b/samples/multiple_draw_buffers/multiple_draw_buffers_vs.glsl
similarity index 100%
rename from samples/angle/multiple_draw_buffers/multiple_draw_buffers_vs.glsl
rename to samples/multiple_draw_buffers/multiple_draw_buffers_vs.glsl
diff --git a/samples/angle/particle_system/ParticleSystem.cpp b/samples/particle_system/ParticleSystem.cpp
similarity index 100%
rename from samples/angle/particle_system/ParticleSystem.cpp
rename to samples/particle_system/ParticleSystem.cpp
diff --git a/samples/angle/particle_system/smoke.tga b/samples/particle_system/smoke.tga
similarity index 100%
rename from samples/angle/particle_system/smoke.tga
rename to samples/particle_system/smoke.tga
diff --git a/samples/angle/post_sub_buffer/PostSubBuffer.cpp b/samples/post_sub_buffer/PostSubBuffer.cpp
similarity index 100%
rename from samples/angle/post_sub_buffer/PostSubBuffer.cpp
rename to samples/post_sub_buffer/PostSubBuffer.cpp
diff --git a/samples/angle/sample_util/Matrix.cpp b/samples/sample_util/Matrix.cpp
similarity index 100%
rename from samples/angle/sample_util/Matrix.cpp
rename to samples/sample_util/Matrix.cpp
diff --git a/samples/angle/sample_util/Matrix.h b/samples/sample_util/Matrix.h
similarity index 100%
rename from samples/angle/sample_util/Matrix.h
rename to samples/sample_util/Matrix.h
diff --git a/samples/angle/sample_util/SampleApplication.cpp b/samples/sample_util/SampleApplication.cpp
similarity index 100%
rename from samples/angle/sample_util/SampleApplication.cpp
rename to samples/sample_util/SampleApplication.cpp
diff --git a/samples/angle/sample_util/SampleApplication.h b/samples/sample_util/SampleApplication.h
similarity index 100%
rename from samples/angle/sample_util/SampleApplication.h
rename to samples/sample_util/SampleApplication.h
diff --git a/samples/angle/sample_util/Vector.cpp b/samples/sample_util/Vector.cpp
similarity index 100%
rename from samples/angle/sample_util/Vector.cpp
rename to samples/sample_util/Vector.cpp
diff --git a/samples/angle/sample_util/Vector.h b/samples/sample_util/Vector.h
similarity index 100%
rename from samples/angle/sample_util/Vector.h
rename to samples/sample_util/Vector.h
diff --git a/samples/angle/sample_util/geometry_utils.cpp b/samples/sample_util/geometry_utils.cpp
similarity index 100%
rename from samples/angle/sample_util/geometry_utils.cpp
rename to samples/sample_util/geometry_utils.cpp
diff --git a/samples/angle/sample_util/geometry_utils.h b/samples/sample_util/geometry_utils.h
similarity index 100%
rename from samples/angle/sample_util/geometry_utils.h
rename to samples/sample_util/geometry_utils.h
diff --git a/samples/angle/sample_util/texture_utils.cpp b/samples/sample_util/texture_utils.cpp
similarity index 100%
rename from samples/angle/sample_util/texture_utils.cpp
rename to samples/sample_util/texture_utils.cpp
diff --git a/samples/angle/sample_util/texture_utils.h b/samples/sample_util/texture_utils.h
similarity index 100%
rename from samples/angle/sample_util/texture_utils.h
rename to samples/sample_util/texture_utils.h
diff --git a/samples/angle/sample_util/tga_utils.cpp b/samples/sample_util/tga_utils.cpp
similarity index 100%
rename from samples/angle/sample_util/tga_utils.cpp
rename to samples/sample_util/tga_utils.cpp
diff --git a/samples/angle/sample_util/tga_utils.h b/samples/sample_util/tga_utils.h
similarity index 100%
rename from samples/angle/sample_util/tga_utils.h
rename to samples/sample_util/tga_utils.h
diff --git a/samples/samples.gyp b/samples/samples.gyp
index 6a20559d3..b9044dfed 100644
--- a/samples/samples.gyp
+++ b/samples/samples.gyp
@@ -53,11 +53,11 @@
                     'include_dirs':
                     [
                         '<(angle_path)/include',
-                        'angle/sample_util',
+                        'sample_util',
                     ],
                     'sources':
                     [
-                        '<!@(python <(angle_path)/enumerate_files.py angle/sample_util -types *.cpp *.h)'
+                        '<!@(python <(angle_path)/enumerate_files.py sample_util -types *.cpp *.h)'
                     ],
                     'msvs_disabled_warnings': [ 4201 ],
                     'direct_dependent_settings':
@@ -65,7 +65,7 @@
                         'msvs_disabled_warnings': [ 4201 ],
                         'include_dirs':
                         [
-                            'angle/sample_util',
+                            'sample_util',
                         ],
                     },
                 },
@@ -75,7 +75,7 @@
                     'type': 'executable',
                     'dependencies': [ 'sample_util' ],
                     'includes': [ '../build/common_defines.gypi', ],
-                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/hello_triangle -types *.cpp *.h)' ],
+                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py hello_triangle -types *.cpp *.h)' ],
                 },
 
                 {
@@ -83,7 +83,7 @@
                     'type': 'executable',
                     'dependencies': [ 'sample_util' ],
                     'includes': [ '../build/common_defines.gypi', ],
-                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/mip_map_2d -types *.cpp *.h)' ],
+                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py mip_map_2d -types *.cpp *.h)' ],
                 },
 
                 {
@@ -91,12 +91,12 @@
                     'type': 'executable',
                     'dependencies': [ 'sample_util' ],
                     'includes': [ '../build/common_defines.gypi', ],
-                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/multi_texture -types *.cpp *.h)' ],
+                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py multi_texture -types *.cpp *.h)' ],
                     'copies':
                     [
                         {
                             'destination': '<(PRODUCT_DIR)',
-                            'files': [ '<!@(python <(angle_path)/enumerate_files.py angle/multi_texture -types *.tga)' ],
+                            'files': [ '<!@(python <(angle_path)/enumerate_files.py multi_texture -types *.tga)' ],
                         },
                     ]
                 },
@@ -106,12 +106,12 @@
                     'type': 'executable',
                     'dependencies': [ 'sample_util' ],
                     'includes': [ '../build/common_defines.gypi', ],
-                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/particle_system -types *.cpp *.h)' ],
+                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py particle_system -types *.cpp *.h)' ],
                     'copies':
                     [
                         {
                             'destination': '<(PRODUCT_DIR)',
-                            'files': [ '<!@(python <(angle_path)/enumerate_files.py angle/particle_system -types *.tga)' ],
+                            'files': [ '<!@(python <(angle_path)/enumerate_files.py particle_system -types *.tga)' ],
                         }
                     ]
                 },
@@ -121,7 +121,7 @@
                     'type': 'executable',
                     'dependencies': [ 'sample_util' ],
                     'includes': [ '../build/common_defines.gypi', ],
-                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/simple_instancing -types *.cpp *.h)' ],
+                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py simple_instancing -types *.cpp *.h)' ],
                 },
 
                 {
@@ -129,7 +129,7 @@
                     'type': 'executable',
                     'dependencies': [ 'sample_util' ],
                     'includes': [ '../build/common_defines.gypi', ],
-                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/tri_fan_microbench -types *.cpp *.h *.glsl)' ],
+                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py tri_fan_microbench -types *.cpp *.h *.glsl)' ],
                 },
 
                 {
@@ -137,7 +137,7 @@
                     'type': 'executable',
                     'dependencies': [ 'sample_util' ],
                     'includes': [ '../build/common_defines.gypi', ],
-                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/tex_redef_microbench -types *.cpp *.h *.glsl)' ],
+                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py tex_redef_microbench -types *.cpp *.h *.glsl)' ],
                 },
 
                 {
@@ -145,12 +145,12 @@
                     'type': 'executable',
                     'dependencies': [ 'sample_util' ],
                     'includes': [ '../build/common_defines.gypi', ],
-                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/multiple_draw_buffers -types *.cpp *.h *.glsl)' ],
+                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py multiple_draw_buffers -types *.cpp *.h *.glsl)' ],
                     'copies':
                     [
                         {
                             'destination': '<(PRODUCT_DIR)',
-                            'files': [ '<!@(python <(angle_path)/enumerate_files.py angle/multiple_draw_buffers -types *.glsl)' ],
+                            'files': [ '<!@(python <(angle_path)/enumerate_files.py multiple_draw_buffers -types *.glsl)' ],
                         }
                     ]
                 },
@@ -160,7 +160,7 @@
                     'type': 'executable',
                     'dependencies': [ 'sample_util' ],
                     'includes': [ '../build/common_defines.gypi', ],
-                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/simple_texture_2d -types *.cpp *.h)' ],
+                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py simple_texture_2d -types *.cpp *.h)' ],
                 },
 
                 {
@@ -168,7 +168,7 @@
                     'type': 'executable',
                     'dependencies': [ 'sample_util' ],
                     'includes': [ '../build/common_defines.gypi', ],
-                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/simple_texture_cubemap -types *.cpp *.h)' ],
+                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py simple_texture_cubemap -types *.cpp *.h)' ],
                 },
 
                 {
@@ -176,7 +176,7 @@
                     'type': 'executable',
                     'dependencies': [ 'sample_util' ],
                     'includes': [ '../build/common_defines.gypi', ],
-                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/simple_vertex_shader -types *.cpp *.h)' ],
+                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py simple_vertex_shader -types *.cpp *.h)' ],
                 },
 
                 {
@@ -184,7 +184,7 @@
                     'type': 'executable',
                     'dependencies': [ 'sample_util' ],
                     'includes': [ '../build/common_defines.gypi', ],
-                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/stencil_operations -types *.cpp *.h)' ],
+                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py stencil_operations -types *.cpp *.h)' ],
                 },
 
                 {
@@ -192,7 +192,7 @@
                     'type': 'executable',
                     'dependencies': [ 'sample_util' ],
                     'includes': [ '../build/common_defines.gypi', ],
-                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/texture_wrap -types *.cpp *.h)' ],
+                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py texture_wrap -types *.cpp *.h)' ],
                 },
 
                 {
@@ -200,7 +200,7 @@
                     'type': 'executable',
                     'dependencies': [ 'sample_util' ],
                     'includes': [ '../build/common_defines.gypi', ],
-                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py angle/post_sub_buffer -types *.cpp *.h)' ],
+                    'sources': [ '<!@(python <(angle_path)/enumerate_files.py post_sub_buffer -types *.cpp *.h)' ],
                 },
             ],
         }
diff --git a/samples/angle/simple_instancing/SimpleInstancing.cpp b/samples/simple_instancing/SimpleInstancing.cpp
similarity index 100%
rename from samples/angle/simple_instancing/SimpleInstancing.cpp
rename to samples/simple_instancing/SimpleInstancing.cpp
diff --git a/samples/angle/simple_texture_2d/SimpleTexture2D.cpp b/samples/simple_texture_2d/SimpleTexture2D.cpp
similarity index 100%
rename from samples/angle/simple_texture_2d/SimpleTexture2D.cpp
rename to samples/simple_texture_2d/SimpleTexture2D.cpp
diff --git a/samples/angle/simple_texture_cubemap/SimpleTextureCubemap.cpp b/samples/simple_texture_cubemap/SimpleTextureCubemap.cpp
similarity index 100%
rename from samples/angle/simple_texture_cubemap/SimpleTextureCubemap.cpp
rename to samples/simple_texture_cubemap/SimpleTextureCubemap.cpp
diff --git a/samples/angle/simple_vertex_shader/SimpleVertexShader.cpp b/samples/simple_vertex_shader/SimpleVertexShader.cpp
similarity index 100%
rename from samples/angle/simple_vertex_shader/SimpleVertexShader.cpp
rename to samples/simple_vertex_shader/SimpleVertexShader.cpp
diff --git a/samples/angle/stencil_operations/StencilOperations.cpp b/samples/stencil_operations/StencilOperations.cpp
similarity index 100%
rename from samples/angle/stencil_operations/StencilOperations.cpp
rename to samples/stencil_operations/StencilOperations.cpp
diff --git a/samples/angle/tex_redef_microbench/TexRedefMicroBench.cpp b/samples/tex_redef_microbench/TexRedefMicroBench.cpp
similarity index 100%
rename from samples/angle/tex_redef_microbench/TexRedefMicroBench.cpp
rename to samples/tex_redef_microbench/TexRedefMicroBench.cpp
diff --git a/samples/angle/texture_wrap/TextureWrap.cpp b/samples/texture_wrap/TextureWrap.cpp
similarity index 100%
rename from samples/angle/texture_wrap/TextureWrap.cpp
rename to samples/texture_wrap/TextureWrap.cpp
diff --git a/samples/angle/tri_fan_microbench/TriFanMicroBench.cpp b/samples/tri_fan_microbench/TriFanMicroBench.cpp
similarity index 100%
rename from samples/angle/tri_fan_microbench/TriFanMicroBench.cpp
rename to samples/tri_fan_microbench/TriFanMicroBench.cpp