diff --git a/FTSources/FTEditor/FTEditor.csproj b/FTSources/FTEditor/FTEditor.csproj
index 19dbd67..0e4255c 100644
--- a/FTSources/FTEditor/FTEditor.csproj
+++ b/FTSources/FTEditor/FTEditor.csproj
@@ -28,10 +28,6 @@
     <DefineConstants>FT_VERSION_FULL</DefineConstants>
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <Folder Include="Sources\" />
-    <Folder Include="FTEditor\" />
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="mscorlib">
       <HintPath>..\DLLs\mscorlib.dll</HintPath>
@@ -66,6 +62,9 @@
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="FTEditor\" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="..\..\Assets\FlashTools\Scripts\Editor\FTEditor\Editors.meta">
       <Link>FTEditor\Editors.meta</Link>
diff --git a/FTSources/FTRuntime/FTRuntime.csproj b/FTSources/FTRuntime/FTRuntime.csproj
index b56c958..9ab90b8 100644
--- a/FTSources/FTRuntime/FTRuntime.csproj
+++ b/FTSources/FTRuntime/FTRuntime.csproj
@@ -39,7 +39,6 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Folder Include="Sources\" />
     <Folder Include="FTRuntime\" />
   </ItemGroup>
   <ItemGroup>
@@ -49,9 +48,6 @@
     <None Include="..\..\Assets\FlashTools\Scripts\FTRuntime\SwfAsset.cs.meta">
       <Link>FTRuntime\SwfAsset.cs.meta</Link>
     </None>
-    <None Include="..\..\Assets\FlashTools\Scripts\FTRuntime\SwfAttributes.cs.meta">
-      <Link>FTRuntime\SwfAttributes.cs.meta</Link>
-    </None>
     <None Include="..\..\Assets\FlashTools\Scripts\FTRuntime\SwfClip.cs.meta">
       <Link>FTRuntime\SwfClip.cs.meta</Link>
     </None>
@@ -67,23 +63,35 @@
     <None Include="..\..\Assets\FlashTools\Scripts\FTRuntime\SwfSettings.cs.meta">
       <Link>FTRuntime\SwfSettings.cs.meta</Link>
     </None>
+    <None Include="..\..\Assets\FlashTools\Scripts\FTRuntime\Yields.meta">
+      <Link>FTRuntime\Yields.meta</Link>
+    </None>
     <None Include="..\..\Assets\FlashTools\Scripts\FTRuntime\Internal\SwfAssocList.cs.meta">
       <Link>FTRuntime\Internal\SwfAssocList.cs.meta</Link>
     </None>
+    <None Include="..\..\Assets\FlashTools\Scripts\FTRuntime\Internal\SwfAttributes.cs.meta">
+      <Link>FTRuntime\Internal\SwfAttributes.cs.meta</Link>
+    </None>
     <None Include="..\..\Assets\FlashTools\Scripts\FTRuntime\Internal\SwfList.cs.meta">
       <Link>FTRuntime\Internal\SwfList.cs.meta</Link>
     </None>
     <None Include="..\..\Assets\FlashTools\Scripts\FTRuntime\Internal\SwfUtils.cs.meta">
       <Link>FTRuntime\Internal\SwfUtils.cs.meta</Link>
     </None>
+    <None Include="..\..\Assets\FlashTools\Scripts\FTRuntime\Yields\SwfWaitPlayStopped.cs.meta">
+      <Link>FTRuntime\Yields\SwfWaitPlayStopped.cs.meta</Link>
+    </None>
+    <None Include="..\..\Assets\FlashTools\Scripts\FTRuntime\Yields\SwfWaitRewindPlaying.cs.meta">
+      <Link>FTRuntime\Yields\SwfWaitRewindPlaying.cs.meta</Link>
+    </None>
+    <None Include="..\..\Assets\FlashTools\Scripts\FTRuntime\Yields\SwfWaitStopPlaying.cs.meta">
+      <Link>FTRuntime\Yields\SwfWaitStopPlaying.cs.meta</Link>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\Assets\FlashTools\Scripts\FTRuntime\SwfAsset.cs">
       <Link>FTRuntime\SwfAsset.cs</Link>
     </Compile>
-    <Compile Include="..\..\Assets\FlashTools\Scripts\FTRuntime\SwfAttributes.cs">
-      <Link>FTRuntime\SwfAttributes.cs</Link>
-    </Compile>
     <Compile Include="..\..\Assets\FlashTools\Scripts\FTRuntime\SwfClip.cs">
       <Link>FTRuntime\SwfClip.cs</Link>
     </Compile>
@@ -102,11 +110,23 @@
     <Compile Include="..\..\Assets\FlashTools\Scripts\FTRuntime\Internal\SwfAssocList.cs">
       <Link>FTRuntime\Internal\SwfAssocList.cs</Link>
     </Compile>
+    <Compile Include="..\..\Assets\FlashTools\Scripts\FTRuntime\Internal\SwfAttributes.cs">
+      <Link>FTRuntime\Internal\SwfAttributes.cs</Link>
+    </Compile>
     <Compile Include="..\..\Assets\FlashTools\Scripts\FTRuntime\Internal\SwfList.cs">
       <Link>FTRuntime\Internal\SwfList.cs</Link>
     </Compile>
     <Compile Include="..\..\Assets\FlashTools\Scripts\FTRuntime\Internal\SwfUtils.cs">
       <Link>FTRuntime\Internal\SwfUtils.cs</Link>
     </Compile>
+    <Compile Include="..\..\Assets\FlashTools\Scripts\FTRuntime\Yields\SwfWaitPlayStopped.cs">
+      <Link>FTRuntime\Yields\SwfWaitPlayStopped.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Assets\FlashTools\Scripts\FTRuntime\Yields\SwfWaitRewindPlaying.cs">
+      <Link>FTRuntime\Yields\SwfWaitRewindPlaying.cs</Link>
+    </Compile>
+    <Compile Include="..\..\Assets\FlashTools\Scripts\FTRuntime\Yields\SwfWaitStopPlaying.cs">
+      <Link>FTRuntime\Yields\SwfWaitStopPlaying.cs</Link>
+    </Compile>
   </ItemGroup>
 </Project>
diff --git a/FTSources/FTSwfTools/FTSwfTools.csproj b/FTSources/FTSwfTools/FTSwfTools.csproj
index c392fb2..12755ad 100644
--- a/FTSources/FTSwfTools/FTSwfTools.csproj
+++ b/FTSources/FTSwfTools/FTSwfTools.csproj
@@ -29,7 +29,6 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Folder Include="Sources\" />
     <Folder Include="FTSwfTools\" />
   </ItemGroup>
   <ItemGroup>