diff --git a/.gitignore b/.gitignore
index 30a047b..939772d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-/.vs
-/bin
-/obj
-*.user
-*.pubxml.user
-*.csproj.user
+bin
+obj
+packages
+*~
+.github
+.vs
\ No newline at end of file
diff --git a/BukkuBuddy.slnx b/BukkuBuddy.slnx
new file mode 100644
index 0000000..eca8ec4
--- /dev/null
+++ b/BukkuBuddy.slnx
@@ -0,0 +1,3 @@
+
+
+
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..357f23e
--- /dev/null
+++ b/README.md
@@ -0,0 +1,40 @@
+# BukkuBuddy Bookmark Manager
+
+> BukkuBuddy Bookmark Manager is a free utility for storing and organising your favourite Internet shortcuts. Your bookmarks are stored in a local save file to give you complete control.
+
+
+
+---
+
+## Features
+
+- Store and organise Internet bookmarks
+- Locally cached favicons (supported formats only)
+- No ads
+
+## Screenshots
+
+[](wiki/screenshot-1.png)
+
+---
+
+## Releases & Builds
+
+See [Releases](/HiImRay_Public/bukkubuddy-bookmark-manager)
+
+## Acknowledgements
+
+This software uses a number of dependencies and assets from third-parties.
+These developers and artists deserve due credit for their work and for their commitment to sharing their work freely.
+Each product is released under their own particular license, for more information please visit their websites.
+
+- [Feather - Simply Beautiful Open Source Icons](https://feathericons.com/)
+- [HtmlAgilityPack](https://htmlagilitypack.codeplex.com/)
+- [Lucide](https://lucide.dev/icons/)
+
+## License
+
+This software is due to be released under the GPLv3 license.
+
+All software on this website is provided "as is" without warranty of any kind, either express or implied.
+The use of this software, in particular, is done solely at your own risk; with agreement that the original author is not liable for any damage (subsequently incurred) of any kind.
\ No newline at end of file
diff --git a/build.bat b/build.bat
index 11b442e..d254b3c 100644
--- a/build.bat
+++ b/build.bat
@@ -1,18 +1,15 @@
-RMDIR /s /q "bin\"
-RMDIR /s /q "obj\"
+rmdir /s /q "bin\"
+rmdir /s /q "source\bin\"
+rmdir /s /q "source\obj\"
-MKDIR bin
-
-dotnet restore skye.sln
-#dotnet build skye.sln -c Release -o ./bin/
-dotnet publish skye.sln -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="bin\"
+dotnet restore BukkuBuddy.slnx
+dotnet publish BukkuBuddy.slnx -r win-x64 -c Release /p:PublishSingleFile=true /p:SelfContained=false /p:PublishReadyToRunfalse=true /p:PublishDir="..\bin\"
"C:\B\Portable Files (dev)\Inno Setup\v6.0.4-2\app\ISCC.exe" "build-installer.iss"
-"C:\B\Portable Files\7-Zip (Portable)\25.01\App\7-Zip64\7z.exe" a -t7z "bin\bukkubuddy.7z" ".\bin\bukkubuddy.exe" -mx9
+"C:\B\Portable Files\7-Zip (Portable)\26.02\App\7-Zip64\7z.exe" a -t7z "bin\bukkubuddy.7z" ".\bin\bukkubuddy.exe" -mx9
-RMDIR /s /q "bin\debug"
-RMDIR /s /q "bin\release"
-RMDIR /s /q "obj\"
+rmdir /s /q "source\bin\"
+rmdir /s /q "source\obj\"
PAUSE
\ No newline at end of file
diff --git a/favicon.ico b/icon/favicon.ico
similarity index 100%
rename from favicon.ico
rename to icon/favicon.ico
diff --git a/icon/icon.svg b/icon/icon.svg
new file mode 100644
index 0000000..d5f9454
--- /dev/null
+++ b/icon/icon.svg
@@ -0,0 +1,195 @@
+
+
diff --git a/icon/icon_128.png b/icon/icon_128.png
new file mode 100644
index 0000000..9378f90
Binary files /dev/null and b/icon/icon_128.png differ
diff --git a/icon/icon_16.png b/icon/icon_16.png
new file mode 100644
index 0000000..2e51050
Binary files /dev/null and b/icon/icon_16.png differ
diff --git a/icon/icon_24.png b/icon/icon_24.png
new file mode 100644
index 0000000..0346ada
Binary files /dev/null and b/icon/icon_24.png differ
diff --git a/icon/icon_32.png b/icon/icon_32.png
new file mode 100644
index 0000000..2f76ad8
Binary files /dev/null and b/icon/icon_32.png differ
diff --git a/icon/icon_48.png b/icon/icon_48.png
new file mode 100644
index 0000000..a0b8981
Binary files /dev/null and b/icon/icon_48.png differ
diff --git a/Resources/icon-64.png b/icon/icon_64.png
similarity index 100%
rename from Resources/icon-64.png
rename to icon/icon_64.png
diff --git a/skye.sln b/skye.sln
deleted file mode 100644
index 0d0bc09..0000000
--- a/skye.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 18
-VisualStudioVersion = 18.5.11801.241 oobstable
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BukkuBuddy", "BukkuBuddy.csproj", "{4833FB27-0817-4720-A54B-180369B0C374}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {4833FB27-0817-4720-A54B-180369B0C374}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4833FB27-0817-4720-A54B-180369B0C374}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4833FB27-0817-4720-A54B-180369B0C374}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4833FB27-0817-4720-A54B-180369B0C374}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {CB4C1DB0-19FE-4AA0-9621-D66FAC4CF7C5}
- EndGlobalSection
-EndGlobal
diff --git a/BukkuBuddy.csproj b/source/BukkuBuddy.csproj
similarity index 100%
rename from BukkuBuddy.csproj
rename to source/BukkuBuddy.csproj
diff --git a/source/BukkuBuddy.csproj.user b/source/BukkuBuddy.csproj.user
new file mode 100644
index 0000000..8e6caa8
--- /dev/null
+++ b/source/BukkuBuddy.csproj.user
@@ -0,0 +1,32 @@
+
+
+
+
+
+ Form
+
+
+ Form
+
+
+ Form
+
+
+ Form
+
+
+ Form
+
+
+ Component
+
+
+
+
+ Designer
+
+
+ Designer
+
+
+
\ No newline at end of file
diff --git a/DTOs/BookmarkModel.cs b/source/DTOs/BookmarkModel.cs
similarity index 100%
rename from DTOs/BookmarkModel.cs
rename to source/DTOs/BookmarkModel.cs
diff --git a/DTOs/SaveFile/App4Options.cs b/source/DTOs/SaveFile/App4Options.cs
similarity index 100%
rename from DTOs/SaveFile/App4Options.cs
rename to source/DTOs/SaveFile/App4Options.cs
diff --git a/DTOs/SaveFile/App6Options.cs b/source/DTOs/SaveFile/App6Options.cs
similarity index 100%
rename from DTOs/SaveFile/App6Options.cs
rename to source/DTOs/SaveFile/App6Options.cs
diff --git a/DTOs/SaveFile/AppOptionsBase.cs b/source/DTOs/SaveFile/AppOptionsBase.cs
similarity index 100%
rename from DTOs/SaveFile/AppOptionsBase.cs
rename to source/DTOs/SaveFile/AppOptionsBase.cs
diff --git a/Forms/AddMultiPageForm.cs b/source/Forms/AddMultiPageForm.cs
similarity index 100%
rename from Forms/AddMultiPageForm.cs
rename to source/Forms/AddMultiPageForm.cs
diff --git a/Forms/AddMultiPageForm.resx b/source/Forms/AddMultiPageForm.resx
similarity index 100%
rename from Forms/AddMultiPageForm.resx
rename to source/Forms/AddMultiPageForm.resx
diff --git a/Forms/ClearIconsForm.cs b/source/Forms/ClearIconsForm.cs
similarity index 100%
rename from Forms/ClearIconsForm.cs
rename to source/Forms/ClearIconsForm.cs
diff --git a/Forms/ClearIconsForm.resx b/source/Forms/ClearIconsForm.resx
similarity index 100%
rename from Forms/ClearIconsForm.resx
rename to source/Forms/ClearIconsForm.resx
diff --git a/Forms/EditBookmarkForm.cs b/source/Forms/EditBookmarkForm.cs
similarity index 100%
rename from Forms/EditBookmarkForm.cs
rename to source/Forms/EditBookmarkForm.cs
diff --git a/Forms/EditBookmarkForm.resx b/source/Forms/EditBookmarkForm.resx
similarity index 100%
rename from Forms/EditBookmarkForm.resx
rename to source/Forms/EditBookmarkForm.resx
diff --git a/Forms/FindForm.cs b/source/Forms/FindForm.cs
similarity index 100%
rename from Forms/FindForm.cs
rename to source/Forms/FindForm.cs
diff --git a/Forms/FindForm.resx b/source/Forms/FindForm.resx
similarity index 100%
rename from Forms/FindForm.resx
rename to source/Forms/FindForm.resx
diff --git a/Forms/LoadingForm.cs b/source/Forms/LoadingForm.cs
similarity index 100%
rename from Forms/LoadingForm.cs
rename to source/Forms/LoadingForm.cs
diff --git a/Forms/LoadingForm.resx b/source/Forms/LoadingForm.resx
similarity index 100%
rename from Forms/LoadingForm.resx
rename to source/Forms/LoadingForm.resx
diff --git a/Forms/OptionsForm.cs b/source/Forms/OptionsForm.cs
similarity index 100%
rename from Forms/OptionsForm.cs
rename to source/Forms/OptionsForm.cs
diff --git a/Forms/OptionsForm.resx b/source/Forms/OptionsForm.resx
similarity index 100%
rename from Forms/OptionsForm.resx
rename to source/Forms/OptionsForm.resx
diff --git a/Forms/UpdateIconsForm.cs b/source/Forms/UpdateIconsForm.cs
similarity index 100%
rename from Forms/UpdateIconsForm.cs
rename to source/Forms/UpdateIconsForm.cs
diff --git a/Forms/UpdateIconsForm.resx b/source/Forms/UpdateIconsForm.resx
similarity index 100%
rename from Forms/UpdateIconsForm.resx
rename to source/Forms/UpdateIconsForm.resx
diff --git a/MainForm.Designer.cs b/source/MainForm.Designer.cs
similarity index 100%
rename from MainForm.Designer.cs
rename to source/MainForm.Designer.cs
diff --git a/MainForm.cs b/source/MainForm.cs
similarity index 100%
rename from MainForm.cs
rename to source/MainForm.cs
diff --git a/MainForm.resx b/source/MainForm.resx
similarity index 100%
rename from MainForm.resx
rename to source/MainForm.resx
diff --git a/Program.cs b/source/Program.cs
similarity index 100%
rename from Program.cs
rename to source/Program.cs
diff --git a/Resources/MainMenu/folder-minus.png b/source/Resources/MainMenu/folder-minus.png
similarity index 100%
rename from Resources/MainMenu/folder-minus.png
rename to source/Resources/MainMenu/folder-minus.png
diff --git a/Resources/MainMenu/help-circle.png b/source/Resources/MainMenu/help-circle.png
similarity index 100%
rename from Resources/MainMenu/help-circle.png
rename to source/Resources/MainMenu/help-circle.png
diff --git a/Resources/MainMenu/save.png b/source/Resources/MainMenu/save.png
similarity index 100%
rename from Resources/MainMenu/save.png
rename to source/Resources/MainMenu/save.png
diff --git a/Resources/MainMenu/search.png b/source/Resources/MainMenu/search.png
similarity index 100%
rename from Resources/MainMenu/search.png
rename to source/Resources/MainMenu/search.png
diff --git a/Resources/MainMenu/settings.png b/source/Resources/MainMenu/settings.png
similarity index 100%
rename from Resources/MainMenu/settings.png
rename to source/Resources/MainMenu/settings.png
diff --git a/Resources/MainMenuResource.Designer.cs b/source/Resources/MainMenuResource.Designer.cs
similarity index 100%
rename from Resources/MainMenuResource.Designer.cs
rename to source/Resources/MainMenuResource.Designer.cs
diff --git a/Resources/MainMenuResource.resx b/source/Resources/MainMenuResource.resx
similarity index 100%
rename from Resources/MainMenuResource.resx
rename to source/Resources/MainMenuResource.resx
diff --git a/Resources/TreeView/arrow-down.png b/source/Resources/TreeView/arrow-down.png
similarity index 100%
rename from Resources/TreeView/arrow-down.png
rename to source/Resources/TreeView/arrow-down.png
diff --git a/Resources/TreeView/arrow-up.png b/source/Resources/TreeView/arrow-up.png
similarity index 100%
rename from Resources/TreeView/arrow-up.png
rename to source/Resources/TreeView/arrow-up.png
diff --git a/Resources/TreeView/bookmark16_blue.png b/source/Resources/TreeView/bookmark16_blue.png
similarity index 100%
rename from Resources/TreeView/bookmark16_blue.png
rename to source/Resources/TreeView/bookmark16_blue.png
diff --git a/Resources/TreeView/bookmark16_red.png b/source/Resources/TreeView/bookmark16_red.png
similarity index 100%
rename from Resources/TreeView/bookmark16_red.png
rename to source/Resources/TreeView/bookmark16_red.png
diff --git a/Resources/TreeView/bookmark16_white.png b/source/Resources/TreeView/bookmark16_white.png
similarity index 100%
rename from Resources/TreeView/bookmark16_white.png
rename to source/Resources/TreeView/bookmark16_white.png
diff --git a/Resources/TreeView/bookmark_root.png b/source/Resources/TreeView/bookmark_root.png
similarity index 100%
rename from Resources/TreeView/bookmark_root.png
rename to source/Resources/TreeView/bookmark_root.png
diff --git a/Resources/TreeView/bookmark_root.svg b/source/Resources/TreeView/bookmark_root.svg
similarity index 100%
rename from Resources/TreeView/bookmark_root.svg
rename to source/Resources/TreeView/bookmark_root.svg
diff --git a/Resources/TreeView/file-question-mark.png b/source/Resources/TreeView/file-question-mark.png
similarity index 100%
rename from Resources/TreeView/file-question-mark.png
rename to source/Resources/TreeView/file-question-mark.png
diff --git a/Resources/TreeView/file-question-mark16.svg b/source/Resources/TreeView/file-question-mark16.svg
similarity index 100%
rename from Resources/TreeView/file-question-mark16.svg
rename to source/Resources/TreeView/file-question-mark16.svg
diff --git a/Resources/TreeView/folder-symlink.png b/source/Resources/TreeView/folder-symlink.png
similarity index 100%
rename from Resources/TreeView/folder-symlink.png
rename to source/Resources/TreeView/folder-symlink.png
diff --git a/Resources/TreeView/folder-symlink16.svg b/source/Resources/TreeView/folder-symlink16.svg
similarity index 100%
rename from Resources/TreeView/folder-symlink16.svg
rename to source/Resources/TreeView/folder-symlink16.svg
diff --git a/Resources/TreeView/folder.png b/source/Resources/TreeView/folder.png
similarity index 100%
rename from Resources/TreeView/folder.png
rename to source/Resources/TreeView/folder.png
diff --git a/Resources/TreeView/folder16.svg b/source/Resources/TreeView/folder16.svg
similarity index 100%
rename from Resources/TreeView/folder16.svg
rename to source/Resources/TreeView/folder16.svg
diff --git a/Resources/TreeView/plus-square.png b/source/Resources/TreeView/plus-square.png
similarity index 100%
rename from Resources/TreeView/plus-square.png
rename to source/Resources/TreeView/plus-square.png
diff --git a/Resources/TreeView/plus.png b/source/Resources/TreeView/plus.png
similarity index 100%
rename from Resources/TreeView/plus.png
rename to source/Resources/TreeView/plus.png
diff --git a/Resources/TreeView/trash-2.png b/source/Resources/TreeView/trash-2.png
similarity index 100%
rename from Resources/TreeView/trash-2.png
rename to source/Resources/TreeView/trash-2.png
diff --git a/Resources/TreeViewResource.Designer.cs b/source/Resources/TreeViewResource.Designer.cs
similarity index 100%
rename from Resources/TreeViewResource.Designer.cs
rename to source/Resources/TreeViewResource.Designer.cs
diff --git a/Resources/TreeViewResource.resx b/source/Resources/TreeViewResource.resx
similarity index 100%
rename from Resources/TreeViewResource.resx
rename to source/Resources/TreeViewResource.resx
diff --git a/source/Resources/icon-64.png b/source/Resources/icon-64.png
new file mode 100644
index 0000000..1ca9e0b
Binary files /dev/null and b/source/Resources/icon-64.png differ
diff --git a/Resources/loading-block.gif b/source/Resources/loading-block.gif
similarity index 100%
rename from Resources/loading-block.gif
rename to source/Resources/loading-block.gif
diff --git a/Services/WebPageService.cs b/source/Services/WebPageService.cs
similarity index 100%
rename from Services/WebPageService.cs
rename to source/Services/WebPageService.cs
diff --git a/Windows/Forms/BookmarkTreeView.cs b/source/Windows/Forms/BookmarkTreeView.cs
similarity index 100%
rename from Windows/Forms/BookmarkTreeView.cs
rename to source/Windows/Forms/BookmarkTreeView.cs
diff --git a/source/favicon.ico b/source/favicon.ico
new file mode 100644
index 0000000..b1f729a
Binary files /dev/null and b/source/favicon.ico differ
diff --git a/wiki/screenshot-1-h240.png b/wiki/screenshot-1-h240.png
new file mode 100644
index 0000000..897ac21
Binary files /dev/null and b/wiki/screenshot-1-h240.png differ
diff --git a/wiki/screenshot-1.png b/wiki/screenshot-1.png
new file mode 100644
index 0000000..dc653bb
Binary files /dev/null and b/wiki/screenshot-1.png differ