diff --git a/Stuart.sln b/Stuart.sln
index 094ed5a..6636ad1 100644
--- a/Stuart.sln
+++ b/Stuart.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stuart", "Stuart.csproj", "{A9368EF5-472F-4168-A20D-917D172B0FC1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stuart", "Stuart\Stuart.csproj", "{A9368EF5-472F-4168-A20D-917D172B0FC1}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/App.xaml b/Stuart/App.xaml
similarity index 100%
rename from App.xaml
rename to Stuart/App.xaml
diff --git a/App.xaml.cs b/Stuart/App.xaml.cs
similarity index 100%
rename from App.xaml.cs
rename to Stuart/App.xaml.cs
diff --git a/Assets/LockScreenLogo.scale-200.png b/Stuart/Assets/LockScreenLogo.scale-200.png
similarity index 100%
rename from Assets/LockScreenLogo.scale-200.png
rename to Stuart/Assets/LockScreenLogo.scale-200.png
diff --git a/Assets/SplashScreen.scale-100.png b/Stuart/Assets/SplashScreen.scale-100.png
similarity index 100%
rename from Assets/SplashScreen.scale-100.png
rename to Stuart/Assets/SplashScreen.scale-100.png
diff --git a/Assets/Square150x150Logo.scale-200.png b/Stuart/Assets/Square150x150Logo.scale-200.png
similarity index 100%
rename from Assets/Square150x150Logo.scale-200.png
rename to Stuart/Assets/Square150x150Logo.scale-200.png
diff --git a/Assets/Square44x44Logo.scale-200.png b/Stuart/Assets/Square44x44Logo.scale-200.png
similarity index 100%
rename from Assets/Square44x44Logo.scale-200.png
rename to Stuart/Assets/Square44x44Logo.scale-200.png
diff --git a/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/Stuart/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from Assets/Square44x44Logo.targetsize-24_altform-unplated.png
rename to Stuart/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/Assets/StoreLogo.png b/Stuart/Assets/StoreLogo.png
similarity index 100%
rename from Assets/StoreLogo.png
rename to Stuart/Assets/StoreLogo.png
diff --git a/Assets/Wide310x150Logo.scale-200.png b/Stuart/Assets/Wide310x150Logo.scale-200.png
similarity index 100%
rename from Assets/Wide310x150Logo.scale-200.png
rename to Stuart/Assets/Wide310x150Logo.scale-200.png
diff --git a/CachedImage.cs b/Stuart/CachedImage.cs
similarity index 100%
rename from CachedImage.cs
rename to Stuart/CachedImage.cs
diff --git a/Converters.cs b/Stuart/Converters.cs
similarity index 100%
rename from Converters.cs
rename to Stuart/Converters.cs
diff --git a/EditGroup.cs b/Stuart/EditGroup.cs
similarity index 100%
rename from EditGroup.cs
rename to Stuart/EditGroup.cs
diff --git a/EditGroupControl.xaml b/Stuart/EditGroupControl.xaml
similarity index 100%
rename from EditGroupControl.xaml
rename to Stuart/EditGroupControl.xaml
diff --git a/EditGroupControl.xaml.cs b/Stuart/EditGroupControl.xaml.cs
similarity index 100%
rename from EditGroupControl.xaml.cs
rename to Stuart/EditGroupControl.xaml.cs
diff --git a/Effect.cs b/Stuart/Effect.cs
similarity index 100%
rename from Effect.cs
rename to Stuart/Effect.cs
diff --git a/EffectMetadata.cs b/Stuart/EffectMetadata.cs
similarity index 100%
rename from EffectMetadata.cs
rename to Stuart/EffectMetadata.cs
diff --git a/EffectPropertiesControl.xaml b/Stuart/EffectPropertiesControl.xaml
similarity index 100%
rename from EffectPropertiesControl.xaml
rename to Stuart/EffectPropertiesControl.xaml
diff --git a/EffectPropertiesControl.xaml.cs b/Stuart/EffectPropertiesControl.xaml.cs
similarity index 100%
rename from EffectPropertiesControl.xaml.cs
rename to Stuart/EffectPropertiesControl.xaml.cs
diff --git a/MainPage.xaml b/Stuart/MainPage.xaml
similarity index 100%
rename from MainPage.xaml
rename to Stuart/MainPage.xaml
diff --git a/MainPage.xaml.cs b/Stuart/MainPage.xaml.cs
similarity index 100%
rename from MainPage.xaml.cs
rename to Stuart/MainPage.xaml.cs
diff --git a/Observable.cs b/Stuart/Observable.cs
similarity index 100%
rename from Observable.cs
rename to Stuart/Observable.cs
diff --git a/Package.StoreAssociation.xml b/Stuart/Package.StoreAssociation.xml
similarity index 100%
rename from Package.StoreAssociation.xml
rename to Stuart/Package.StoreAssociation.xml
diff --git a/Photo.cs b/Stuart/Photo.cs
similarity index 100%
rename from Photo.cs
rename to Stuart/Photo.cs
diff --git a/Properties/AssemblyInfo.cs b/Stuart/Properties/AssemblyInfo.cs
similarity index 100%
rename from Properties/AssemblyInfo.cs
rename to Stuart/Properties/AssemblyInfo.cs
diff --git a/Properties/Default.rd.xml b/Stuart/Properties/Default.rd.xml
similarity index 100%
rename from Properties/Default.rd.xml
rename to Stuart/Properties/Default.rd.xml
diff --git a/Stuart.appxmanifest b/Stuart/Stuart.appxmanifest
similarity index 100%
rename from Stuart.appxmanifest
rename to Stuart/Stuart.appxmanifest
diff --git a/Stuart.csproj b/Stuart/Stuart.csproj
similarity index 99%
rename from Stuart.csproj
rename to Stuart/Stuart.csproj
index ff677cb..87dacfd 100644
--- a/Stuart.csproj
+++ b/Stuart/Stuart.csproj
@@ -122,8 +122,6 @@
Designer
-
-
diff --git a/Stuart.pfx b/Stuart/Stuart.pfx
similarity index 100%
rename from Stuart.pfx
rename to Stuart/Stuart.pfx
diff --git a/Stuart_StoreKey.pfx b/Stuart/Stuart_StoreKey.pfx
similarity index 100%
rename from Stuart_StoreKey.pfx
rename to Stuart/Stuart_StoreKey.pfx
diff --git a/project.json b/Stuart/project.json
similarity index 100%
rename from project.json
rename to Stuart/project.json