(XDK D3D) Refactoring