diff --git a/src/xenia/gpu/buffer_resource.cc b/src/xenia/gpu/buffer_resource.cc
new file mode 100644
index 000000000..d6019d95f
--- /dev/null
+++ b/src/xenia/gpu/buffer_resource.cc
@@ -0,0 +1,17 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include <xenia/gpu/buffer_resource.h>
+
+
+using namespace std;
+using namespace xe;
+using namespace xe::gpu;
+using namespace xe::gpu::xenos;
+
diff --git a/src/xenia/gpu/buffer_resource.h b/src/xenia/gpu/buffer_resource.h
new file mode 100644
index 000000000..385a5049a
--- /dev/null
+++ b/src/xenia/gpu/buffer_resource.h
@@ -0,0 +1,30 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#ifndef XENIA_GPU_BUFFER_RESOURCE_H_
+#define XENIA_GPU_BUFFER_RESOURCE_H_
+
+#include <xenia/core.h>
+#include <xenia/gpu/xenos/xenos.h>
+
+
+namespace xe {
+namespace gpu {
+
+
+class BufferResource : public Resource {
+public:
+};
+
+
+}  // namespace gpu
+}  // namespace xe
+
+
+#endif  // XENIA_GPU_BUFFER_RESOURCE_H_
diff --git a/src/xenia/gpu/command_buffer.h b/src/xenia/gpu/command_buffer.h
deleted file mode 100644
index b601505f5..000000000
--- a/src/xenia/gpu/command_buffer.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- ******************************************************************************
- * Xenia : Xbox 360 Emulator Research Project                                 *
- ******************************************************************************
- * Copyright 2013 Ben Vanik. All rights reserved.                             *
- * Released under the BSD license - see LICENSE in the root for more details. *
- ******************************************************************************
- */
-
-#ifndef XENIA_GPU_COMMAND_BUFFER_H_
-#define XENIA_GPU_COMMAND_BUFFER_H_
-
-#include <xenia/core.h>
-
-
-namespace xe {
-namespace gpu {
-
-
-// TODO(benvanik): command packet types.
-
-
-class CommandBuffer {
-public:
-  CommandBuffer(xe_memory_ref memory) {
-    memory_ = xe_memory_retain(memory);
-  }
-
-  virtual ~CommandBuffer() {
-    xe_memory_release(memory_);
-  }
-
-  xe_memory_ref memory() {
-    return memory_;
-  }
-
-  // TODO(benvanik): command methods.
-  virtual void Foo() = 0;
-
-protected:
-  xe_memory_ref   memory_;
-};
-
-
-}  // namespace gpu
-}  // namespace xe
-
-
-#endif  // XENIA_GPU_COMMAND_BUFFER_H_
diff --git a/src/xenia/gpu/command_processor.cc b/src/xenia/gpu/command_processor.cc
new file mode 100644
index 000000000..bb7a02bc7
--- /dev/null
+++ b/src/xenia/gpu/command_processor.cc
@@ -0,0 +1,17 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include <xenia/gpu/command_processor.h>
+
+
+using namespace std;
+using namespace xe;
+using namespace xe::gpu;
+using namespace xe::gpu::xenos;
+
diff --git a/src/xenia/gpu/command_processor.h b/src/xenia/gpu/command_processor.h
new file mode 100644
index 000000000..65d5dfc71
--- /dev/null
+++ b/src/xenia/gpu/command_processor.h
@@ -0,0 +1,30 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#ifndef XENIA_GPU_COMMAND_PROCESSOR_H_
+#define XENIA_GPU_COMMAND_PROCESSOR_H_
+
+#include <xenia/core.h>
+#include <xenia/gpu/xenos/xenos.h>
+
+
+namespace xe {
+namespace gpu {
+
+
+class CommandProcessor {
+public:
+};
+
+
+}  // namespace gpu
+}  // namespace xe
+
+
+#endif  // XENIA_GPU_COMMAND_PROCESSOR_H_
diff --git a/src/xenia/gpu/register_file.cc b/src/xenia/gpu/register_file.cc
new file mode 100644
index 000000000..f6f119376
--- /dev/null
+++ b/src/xenia/gpu/register_file.cc
@@ -0,0 +1,17 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include <xenia/gpu/register_file.h>
+
+
+using namespace std;
+using namespace xe;
+using namespace xe::gpu;
+using namespace xe::gpu::xenos;
+
diff --git a/src/xenia/gpu/register_file.h b/src/xenia/gpu/register_file.h
new file mode 100644
index 000000000..2a530995f
--- /dev/null
+++ b/src/xenia/gpu/register_file.h
@@ -0,0 +1,30 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#ifndef XENIA_GPU_REGISTER_FILE_H_
+#define XENIA_GPU_REGISTER_FILE_H_
+
+#include <xenia/core.h>
+#include <xenia/gpu/xenos/xenos.h>
+
+
+namespace xe {
+namespace gpu {
+
+
+class RegisterFile {
+public:
+};
+
+
+}  // namespace gpu
+}  // namespace xe
+
+
+#endif  // XENIA_GPU_REGISTER_FILE_H_
diff --git a/src/xenia/gpu/resource.cc b/src/xenia/gpu/resource.cc
new file mode 100644
index 000000000..88966aac5
--- /dev/null
+++ b/src/xenia/gpu/resource.cc
@@ -0,0 +1,17 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include <xenia/gpu/resource.h>
+
+
+using namespace std;
+using namespace xe;
+using namespace xe::gpu;
+using namespace xe::gpu::xenos;
+
diff --git a/src/xenia/gpu/resource.h b/src/xenia/gpu/resource.h
new file mode 100644
index 000000000..e9a0be7fa
--- /dev/null
+++ b/src/xenia/gpu/resource.h
@@ -0,0 +1,30 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#ifndef XENIA_GPU_RESOURCE_H_
+#define XENIA_GPU_RESOURCE_H_
+
+#include <xenia/core.h>
+#include <xenia/gpu/xenos/xenos.h>
+
+
+namespace xe {
+namespace gpu {
+
+
+class Resource {
+public:
+};
+
+
+}  // namespace gpu
+}  // namespace xe
+
+
+#endif  // XENIA_GPU_RESOURCE_H_
diff --git a/src/xenia/gpu/resource_cache.cc b/src/xenia/gpu/resource_cache.cc
new file mode 100644
index 000000000..7a9a1c24d
--- /dev/null
+++ b/src/xenia/gpu/resource_cache.cc
@@ -0,0 +1,17 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include <xenia/gpu/resource_cache.h>
+
+
+using namespace std;
+using namespace xe;
+using namespace xe::gpu;
+using namespace xe::gpu::xenos;
+
diff --git a/src/xenia/gpu/resource_cache.h b/src/xenia/gpu/resource_cache.h
new file mode 100644
index 000000000..7caaad51f
--- /dev/null
+++ b/src/xenia/gpu/resource_cache.h
@@ -0,0 +1,30 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#ifndef XENIA_GPU_RESOURCE_CACHE_H_
+#define XENIA_GPU_RESOURCE_CACHE_H_
+
+#include <xenia/core.h>
+#include <xenia/gpu/xenos/xenos.h>
+
+
+namespace xe {
+namespace gpu {
+
+
+class ResourceCache {
+public:
+};
+
+
+}  // namespace gpu
+}  // namespace xe
+
+
+#endif  // XENIA_GPU_RESOURCE_CACHE_H_
diff --git a/src/xenia/gpu/shader_resource.cc b/src/xenia/gpu/shader_resource.cc
new file mode 100644
index 000000000..e2520db62
--- /dev/null
+++ b/src/xenia/gpu/shader_resource.cc
@@ -0,0 +1,17 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include <xenia/gpu/shader_resource.h>
+
+
+using namespace std;
+using namespace xe;
+using namespace xe::gpu;
+using namespace xe::gpu::xenos;
+
diff --git a/src/xenia/gpu/shader_resource.h b/src/xenia/gpu/shader_resource.h
new file mode 100644
index 000000000..24b787ec4
--- /dev/null
+++ b/src/xenia/gpu/shader_resource.h
@@ -0,0 +1,30 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#ifndef XENIA_GPU_SHADER_RESOURCE_H_
+#define XENIA_GPU_SHADER_RESOURCE_H_
+
+#include <xenia/core.h>
+#include <xenia/gpu/xenos/xenos.h>
+
+
+namespace xe {
+namespace gpu {
+
+
+class ShaderResource : public Resource {
+public:
+};
+
+
+}  // namespace gpu
+}  // namespace xe
+
+
+#endif  // XENIA_GPU_SHADER_RESOURCE_H_
diff --git a/src/xenia/gpu/sources.gypi b/src/xenia/gpu/sources.gypi
index b2c9134c0..3d4462fd1 100644
--- a/src/xenia/gpu/sources.gypi
+++ b/src/xenia/gpu/sources.gypi
@@ -1,11 +1,10 @@
 # Copyright 2013 Ben Vanik. All Rights Reserved.
 {
   'sources': [
-    'buffer.cc',
-    'buffer.h',
-    'buffer_cache.cc',
-    'buffer_cache.h',
-    'command_buffer.h',
+    'buffer_resource.cc',
+    'buffer_resource.h',
+    'command_processor.cc',
+    'command_processor.h',
     'gpu-private.h',
     'gpu.cc',
     'gpu.h',
@@ -13,16 +12,16 @@
     'graphics_driver.h',
     'graphics_system.cc',
     'graphics_system.h',
-    'ring_buffer_worker.cc',
-    'ring_buffer_worker.h',
-    'shader.cc',
-    'shader.h',
-    'shader_cache.cc',
-    'shader_cache.h',
-    'texture.cc',
-    'texture.h',
-    'texture_cache.cc',
-    'texture_cache.h',
+    'register_file.cc',
+    'register_file.h',
+    'resource.cc',
+    'resource.h',
+    'resource_cache.cc',
+    'resource_cache.h',
+    'shader_resource.cc',
+    'shader_resource.h',
+    'texture_resource.cc',
+    'texture_resource.h',
   ],
 
   'includes': [
diff --git a/src/xenia/gpu/texture_resource.cc b/src/xenia/gpu/texture_resource.cc
new file mode 100644
index 000000000..5875e76f3
--- /dev/null
+++ b/src/xenia/gpu/texture_resource.cc
@@ -0,0 +1,17 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#include <xenia/gpu/texture_resource.h>
+
+
+using namespace std;
+using namespace xe;
+using namespace xe::gpu;
+using namespace xe::gpu::xenos;
+
diff --git a/src/xenia/gpu/texture_resource.h b/src/xenia/gpu/texture_resource.h
new file mode 100644
index 000000000..35f83bcda
--- /dev/null
+++ b/src/xenia/gpu/texture_resource.h
@@ -0,0 +1,33 @@
+/**
+ ******************************************************************************
+ * Xenia : Xbox 360 Emulator Research Project                                 *
+ ******************************************************************************
+ * Copyright 2014 Ben Vanik. All rights reserved.                             *
+ * Released under the BSD license - see LICENSE in the root for more details. *
+ ******************************************************************************
+ */
+
+#ifndef XENIA_GPU_TEXTURE_RESOURCE_H_
+#define XENIA_GPU_TEXTURE_RESOURCE_H_
+
+#include <xenia/core.h>
+#include <xenia/gpu/xenos/xenos.h>
+
+// TODO(benvanik): replace DXGI constants with xenia constants.
+#include <d3d11.h>
+
+
+namespace xe {
+namespace gpu {
+
+
+class TextureResource : public Resource {
+public:
+};
+
+
+}  // namespace gpu
+}  // namespace xe
+
+
+#endif  // XENIA_GPU_TEXTURE_RESOURCE_H_