diff --git a/GameData/ASP/TheWriteStuff/Parts/SignPosts/ASP_Signpost_Circle.cfg b/GameData/ASP/TheWriteStuff/Parts/SignPosts/ASP_Signpost_Circle.cfg
index 82ee907..215e6b6 100644
--- a/GameData/ASP/TheWriteStuff/Parts/SignPosts/ASP_Signpost_Circle.cfg
+++ b/GameData/ASP/TheWriteStuff/Parts/SignPosts/ASP_Signpost_Circle.cfg
@@ -41,7 +41,12 @@ NODE
 
 MODULE
 {
-    name = TWSAnimate
+    name = ASPEvaRename
+}
+
+MODULE
+{
+    name = ASPAnimate
     animationName = extend
     startEventGUIName = Extend
     endEventGUIName = Retract
diff --git a/GameData/ASP/TheWriteStuff/Parts/SignPosts/ASP_Signpost_Inverted_Triangle.cfg b/GameData/ASP/TheWriteStuff/Parts/SignPosts/ASP_Signpost_Inverted_Triangle.cfg
index c15e343..9d784cc 100644
--- a/GameData/ASP/TheWriteStuff/Parts/SignPosts/ASP_Signpost_Inverted_Triangle.cfg
+++ b/GameData/ASP/TheWriteStuff/Parts/SignPosts/ASP_Signpost_Inverted_Triangle.cfg
@@ -41,7 +41,12 @@ NODE
 
 MODULE
 {
-    name = TWSAnimate
+    name = ASPEvaRename
+}
+
+MODULE
+{
+    name = ASPAnimate
     animationName = extend
     startEventGUIName = Extend
     endEventGUIName = Retract
diff --git a/GameData/ASP/TheWriteStuff/Parts/SignPosts/ASP_Signpost_Rectangle.cfg b/GameData/ASP/TheWriteStuff/Parts/SignPosts/ASP_Signpost_Rectangle.cfg
index 8b63d48..7dd30f9 100644
--- a/GameData/ASP/TheWriteStuff/Parts/SignPosts/ASP_Signpost_Rectangle.cfg
+++ b/GameData/ASP/TheWriteStuff/Parts/SignPosts/ASP_Signpost_Rectangle.cfg
@@ -41,7 +41,12 @@ NODE
 
 MODULE
 {
-    name = TWSAnimate
+    name = ASPEvaRename
+}
+
+MODULE
+{
+    name = ASPAnimate
     animationName = extend
     startEventGUIName = Extend
     endEventGUIName = Retract
diff --git a/GameData/ASP/TheWriteStuff/Parts/SignPosts/ASP_Signpost_Triangle.cfg b/GameData/ASP/TheWriteStuff/Parts/SignPosts/ASP_Signpost_Triangle.cfg
index 2107095..6cad044 100644
--- a/GameData/ASP/TheWriteStuff/Parts/SignPosts/ASP_Signpost_Triangle.cfg
+++ b/GameData/ASP/TheWriteStuff/Parts/SignPosts/ASP_Signpost_Triangle.cfg
@@ -41,7 +41,12 @@ NODE
 
 MODULE
 {
-    name = TWSAnimate
+    name = ASPEvaRename
+}
+
+MODULE
+{
+    name = ASPAnimate
     animationName = extend
     startEventGUIName = Extend
     endEventGUIName = Retract
diff --git a/Source/TWSAnimate/Properties/AssemblyInfo.cs b/Source/TWSAnimate/Properties/AssemblyInfo.cs
deleted file mode 100644
index c87ba1e..0000000
--- a/Source/TWSAnimate/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("TWSAnimate")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("TWSAnimate")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("40b9e43c-fe10-49b6-ba58-864a1e48028d")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.0.0")]
-[assembly: AssemblyFileVersion("10.1.0.0")]
diff --git a/Source/TWSAnimate/TWSAnimate.csproj b/Source/TWSAnimate/TWSAnimate.csproj
deleted file mode 100644
index e22c054..0000000
--- a/Source/TWSAnimate/TWSAnimate.csproj
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{40B9E43C-FE10-49B6-BA58-864A1E48028D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>TWSAnimate</RootNamespace>
-    <AssemblyName>TWSAnimate</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Assembly-CSharp">
-      <HintPath>..\..\..\ksptest\Kerbal Space Program\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="Assembly-CSharp-firstpass">
-      <HintPath>..\..\..\ksptest\Kerbal Space Program\KSP_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="UnityEngine">
-      <HintPath>..\..\..\ksptest\Kerbal Space Program\KSP_Data\Managed\UnityEngine.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEngine.UI">
-      <HintPath>..\..\..\ksptest\Kerbal Space Program\KSP_Data\Managed\UnityEngine.UI.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="TWSAnimate.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\TheWriteStuff\TheWriteStuff.csproj">
-      <Project>{640a141c-06d6-46e8-8cf2-906e3ff4681d}</Project>
-      <Name>TheWriteStuff</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>set ProjectDestDir=..\..\..\..\GameData\ASP\TheWriteStuff\Plugins
-if not exist "$ProjectDestDir" (
-    echo "%25ProjectDestDir%25"
-    mkdir "%25ProjectDestDir%25"
-)
-xcopy /s /f /y "$(TargetPath)" "%25ProjectDestDir%25"</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/Source/TheWriteStuff.sln b/Source/TheWriteStuff.sln
index 6a46b8f..beb21a6 100644
--- a/Source/TheWriteStuff.sln
+++ b/Source/TheWriteStuff.sln
@@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TheWriteStuff", "TheWriteSt
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TWSPainter", "TWSPainter\TWSPainter.csproj", "{BBA46433-C09B-4819-A207-2A4C2BEC8828}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TWSAnimate", "TWSAnimate\TWSAnimate.csproj", "{40B9E43C-FE10-49B6-BA58-864A1E48028D}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@ Global
 		{BBA46433-C09B-4819-A207-2A4C2BEC8828}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BBA46433-C09B-4819-A207-2A4C2BEC8828}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BBA46433-C09B-4819-A207-2A4C2BEC8828}.Release|Any CPU.Build.0 = Release|Any CPU
-		{40B9E43C-FE10-49B6-BA58-864A1E48028D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{40B9E43C-FE10-49B6-BA58-864A1E48028D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{40B9E43C-FE10-49B6-BA58-864A1E48028D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{40B9E43C-FE10-49B6-BA58-864A1E48028D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Source/TWSAnimate/TWSAnimate.cs b/Source/TheWriteStuff/ASPAnimate.cs
similarity index 96%
rename from Source/TWSAnimate/TWSAnimate.cs
rename to Source/TheWriteStuff/ASPAnimate.cs
index e1d0e26..f36cb33 100644
--- a/Source/TWSAnimate/TWSAnimate.cs
+++ b/Source/TheWriteStuff/ASPAnimate.cs
@@ -6,7 +6,7 @@
 
 namespace ASP
 {
-    public class TWSAnimate : ModuleAnimateGeneric
+    public class ASPAnimate : ModuleAnimateGeneric
     {
         [KSPEvent(name = "RaiseMaxHeightQuick", guiName = "Raise Max Height ++", active = true, guiActive = false, guiActiveEditor = false, guiActiveUnfocused = true, externalToEVAOnly = true)]
         public void RaiseMaxHeightQuick()
diff --git a/Source/TheWriteStuff/TheWriteStuff.csproj b/Source/TheWriteStuff/TheWriteStuff.csproj
index b25bbaf..ef5122b 100644
--- a/Source/TheWriteStuff/TheWriteStuff.csproj
+++ b/Source/TheWriteStuff/TheWriteStuff.csproj
@@ -52,6 +52,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ASPAnimate.cs" />
+    <Compile Include="ASPEvaRename.cs" />
     <Compile Include="ASPFlatPlateScale.cs" />
     <Compile Include="ASPTextureEdit.cs" />
     <Compile Include="BitmapDecal.cs" />