diff --git a/YouTubeScraper/YouTube.API.Test/ClosedCaptionsTest.cs b/YouTube.API.Test/ClosedCaptionsTest.cs
similarity index 100%
rename from YouTubeScraper/YouTube.API.Test/ClosedCaptionsTest.cs
rename to YouTube.API.Test/ClosedCaptionsTest.cs
diff --git a/YouTubeScraper/YouTube.API.Test/DashManifestTest.cs b/YouTube.API.Test/DashManifestTest.cs
similarity index 100%
rename from YouTubeScraper/YouTube.API.Test/DashManifestTest.cs
rename to YouTube.API.Test/DashManifestTest.cs
diff --git a/YouTubeScraper/YouTube.API.Test/VideoPlaybackTest.cs b/YouTube.API.Test/VideoPlaybackTest.cs
similarity index 100%
rename from YouTubeScraper/YouTube.API.Test/VideoPlaybackTest.cs
rename to YouTube.API.Test/VideoPlaybackTest.cs
diff --git a/YouTubeScraper/YouTube.API.Test/WatchLaterTest.cs b/YouTube.API.Test/WatchLaterTest.cs
similarity index 100%
rename from YouTubeScraper/YouTube.API.Test/WatchLaterTest.cs
rename to YouTube.API.Test/WatchLaterTest.cs
diff --git a/YouTubeScraper/YouTube.API.Test/YouTube.API.Test.csproj b/YouTube.API.Test/YouTube.API.Test.csproj
similarity index 85%
rename from YouTubeScraper/YouTube.API.Test/YouTube.API.Test.csproj
rename to YouTube.API.Test/YouTube.API.Test.csproj
index 6983232..d10404e 100644
--- a/YouTubeScraper/YouTube.API.Test/YouTube.API.Test.csproj
+++ b/YouTube.API.Test/YouTube.API.Test.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\YouTubeScraper\YouTube.API.csproj" />
+    <ProjectReference Include="..\YouTube.API\YouTube.API.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/YouTubeScraper/YouTube.API.sln b/YouTube.API.sln
similarity index 94%
rename from YouTubeScraper/YouTube.API.sln
rename to YouTube.API.sln
index 0df3625..3f52295 100644
--- a/YouTubeScraper/YouTube.API.sln
+++ b/YouTube.API.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29424.173
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YouTube.API", "YouTubeScraper\YouTube.API.csproj", "{F7E1AD03-B67C-4C79-BE84-682490ED05C5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YouTube.API", "YouTube.API\YouTube.API.csproj", "{F7E1AD03-B67C-4C79-BE84-682490ED05C5}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YouTube.API.Test", "YouTube.API.Test\YouTube.API.Test.csproj", "{D5E35A2A-03CA-4A5B-9F12-80E078356340}"
 EndProject
diff --git a/YouTubeScraper/YouTubeScraper/Assets/DashManifestTemplate.xml b/YouTube.API/Assets/DashManifestTemplate.xml
similarity index 100%
rename from YouTubeScraper/YouTubeScraper/Assets/DashManifestTemplate.xml
rename to YouTube.API/Assets/DashManifestTemplate.xml
diff --git a/YouTubeScraper/YouTubeScraper/Authorization/AuthorizationHelpers.cs b/YouTube.API/Authorization/AuthorizationHelpers.cs
similarity index 100%
rename from YouTubeScraper/YouTubeScraper/Authorization/AuthorizationHelpers.cs
rename to YouTube.API/Authorization/AuthorizationHelpers.cs
diff --git a/YouTubeScraper/YouTubeScraper/Extensions.cs b/YouTube.API/Extensions.cs
similarity index 100%
rename from YouTubeScraper/YouTubeScraper/Extensions.cs
rename to YouTube.API/Extensions.cs
diff --git a/YouTubeScraper/YouTubeScraper/Generators/ManifestGenerator.cs b/YouTube.API/Generators/ManifestGenerator.cs
similarity index 100%
rename from YouTubeScraper/YouTubeScraper/Generators/ManifestGenerator.cs
rename to YouTube.API/Generators/ManifestGenerator.cs
diff --git a/YouTubeScraper/YouTubeScraper/Models/ClosedCaptionInfo.cs b/YouTube.API/Models/ClosedCaptionInfo.cs
similarity index 100%
rename from YouTubeScraper/YouTubeScraper/Models/ClosedCaptionInfo.cs
rename to YouTube.API/Models/ClosedCaptionInfo.cs
diff --git a/YouTubeScraper/YouTubeScraper/Models/ClosedCaptionTrack.cs b/YouTube.API/Models/ClosedCaptionTrack.cs
similarity index 100%
rename from YouTubeScraper/YouTubeScraper/Models/ClosedCaptionTrack.cs
rename to YouTube.API/Models/ClosedCaptionTrack.cs
diff --git a/YouTubeScraper/YouTubeScraper/Models/DashManifest.cs b/YouTube.API/Models/DashManifest.cs
similarity index 100%
rename from YouTubeScraper/YouTubeScraper/Models/DashManifest.cs
rename to YouTube.API/Models/DashManifest.cs
diff --git a/YouTubeScraper/YouTubeScraper/Models/PlaybackUrl.cs b/YouTube.API/Models/PlaybackUrl.cs
similarity index 100%
rename from YouTubeScraper/YouTubeScraper/Models/PlaybackUrl.cs
rename to YouTube.API/Models/PlaybackUrl.cs
diff --git a/YouTubeScraper/YouTubeScraper/Models/VideoPlayback.cs b/YouTube.API/Models/VideoPlayback.cs
similarity index 100%
rename from YouTubeScraper/YouTubeScraper/Models/VideoPlayback.cs
rename to YouTube.API/Models/VideoPlayback.cs
diff --git a/YouTubeScraper/YouTubeScraper/Properties/Resources.Designer.cs b/YouTube.API/Properties/Resources.Designer.cs
similarity index 100%
rename from YouTubeScraper/YouTubeScraper/Properties/Resources.Designer.cs
rename to YouTube.API/Properties/Resources.Designer.cs
diff --git a/YouTubeScraper/YouTubeScraper/Properties/Resources.resx b/YouTube.API/Properties/Resources.resx
similarity index 100%
rename from YouTubeScraper/YouTubeScraper/Properties/Resources.resx
rename to YouTube.API/Properties/Resources.resx
diff --git a/YouTubeScraper/YouTubeScraper/Resources/CaptionsResource.cs b/YouTube.API/Resources/CaptionsResource.cs
similarity index 100%
rename from YouTubeScraper/YouTubeScraper/Resources/CaptionsResource.cs
rename to YouTube.API/Resources/CaptionsResource.cs
diff --git a/YouTubeScraper/YouTubeScraper/Resources/DashManifestsResource.cs b/YouTube.API/Resources/DashManifestsResource.cs
similarity index 100%
rename from YouTubeScraper/YouTubeScraper/Resources/DashManifestsResource.cs
rename to YouTube.API/Resources/DashManifestsResource.cs
diff --git a/YouTubeScraper/YouTubeScraper/Resources/HistoryResource.cs b/YouTube.API/Resources/HistoryResource.cs
similarity index 100%
rename from YouTubeScraper/YouTubeScraper/Resources/HistoryResource.cs
rename to YouTube.API/Resources/HistoryResource.cs
diff --git a/YouTubeScraper/YouTubeScraper/Resources/VideoPlaybackResource.cs b/YouTube.API/Resources/VideoPlaybackResource.cs
similarity index 100%
rename from YouTubeScraper/YouTubeScraper/Resources/VideoPlaybackResource.cs
rename to YouTube.API/Resources/VideoPlaybackResource.cs
diff --git a/YouTubeScraper/YouTubeScraper/Resources/WatchLaterResource.cs b/YouTube.API/Resources/WatchLaterResource.cs
similarity index 100%
rename from YouTubeScraper/YouTubeScraper/Resources/WatchLaterResource.cs
rename to YouTube.API/Resources/WatchLaterResource.cs
diff --git a/YouTubeScraper/YouTubeScraper/VideoQuality.cs b/YouTube.API/VideoQuality.cs
similarity index 100%
rename from YouTubeScraper/YouTubeScraper/VideoQuality.cs
rename to YouTube.API/VideoQuality.cs
diff --git a/YouTubeScraper/YouTubeScraper/YouTube.API.csproj b/YouTube.API/YouTube.API.csproj
similarity index 89%
rename from YouTubeScraper/YouTubeScraper/YouTube.API.csproj
rename to YouTube.API/YouTube.API.csproj
index 48a4e97..2c08fb0 100644
--- a/YouTubeScraper/YouTubeScraper/YouTube.API.csproj
+++ b/YouTube.API/YouTube.API.csproj
@@ -10,6 +10,10 @@
     <AssemblyVersion>1.0.1.0</AssemblyVersion>
     <FileVersion>1.0.1.0</FileVersion>
     <Version>1.0.1</Version>
+    <PackageId>ExtendedYouTubeAPI</PackageId>
+    <Authors>Michael "XFox" Gordeev</Authors>
+    <Product>ExtendedYouTubeAPI</Product>
+    <RepositoryUrl>https://github.com/xfox111/YouTubeScraper</RepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/YouTubeScraper/YouTubeScraper/YouTubeService.cs b/YouTube.API/YouTubeService.cs
similarity index 100%
rename from YouTubeScraper/YouTubeScraper/YouTubeService.cs
rename to YouTube.API/YouTubeService.cs