diff --git a/App.xaml b/Application/App.xaml
similarity index 100%
rename from App.xaml
rename to Application/App.xaml
diff --git a/App.xaml.cs b/Application/App.xaml.cs
similarity index 100%
rename from App.xaml.cs
rename to Application/App.xaml.cs
diff --git a/BrowserCommon.cs b/Application/BrowserCommon.cs
similarity index 100%
rename from BrowserCommon.cs
rename to Application/BrowserCommon.cs
diff --git a/Category.cs b/Application/Category.cs
similarity index 100%
rename from Category.cs
rename to Application/Category.cs
diff --git a/Data/Database.cs b/Application/Data/Database.cs
similarity index 100%
rename from Data/Database.cs
rename to Application/Data/Database.cs
diff --git a/Data/Extensions.cs b/Application/Data/Extensions.cs
similarity index 100%
rename from Data/Extensions.cs
rename to Application/Data/Extensions.cs
diff --git a/Database/Template.sdf b/Application/Database/Template.sdf
similarity index 100%
rename from Database/Template.sdf
rename to Application/Database/Template.sdf
diff --git a/Entities.cs b/Application/Entities.cs
similarity index 100%
rename from Entities.cs
rename to Application/Entities.cs
diff --git a/Feed.cs b/Application/Feed.cs
similarity index 100%
rename from Feed.cs
rename to Application/Feed.cs
diff --git a/FeedAction.cs b/Application/FeedAction.cs
similarity index 100%
rename from FeedAction.cs
rename to Application/FeedAction.cs
diff --git a/FeedCenter.csproj b/Application/FeedCenter.csproj
similarity index 100%
rename from FeedCenter.csproj
rename to Application/FeedCenter.csproj
diff --git a/FeedCenter.csproj.DotSettings b/Application/FeedCenter.csproj.DotSettings
similarity index 100%
rename from FeedCenter.csproj.DotSettings
rename to Application/FeedCenter.csproj.DotSettings
diff --git a/FeedCenterEntities.datasource b/Application/FeedCenterEntities.datasource
similarity index 100%
rename from FeedCenterEntities.datasource
rename to Application/FeedCenterEntities.datasource
diff --git a/FeedCenterEntities1.datasource b/Application/FeedCenterEntities1.datasource
similarity index 100%
rename from FeedCenterEntities1.datasource
rename to Application/FeedCenterEntities1.datasource
diff --git a/FeedCenterEntities2.datasource b/Application/FeedCenterEntities2.datasource
similarity index 100%
rename from FeedCenterEntities2.datasource
rename to Application/FeedCenterEntities2.datasource
diff --git a/FeedCenter_1_TemporaryKey.pfx b/Application/FeedCenter_1_TemporaryKey.pfx
similarity index 100%
rename from FeedCenter_1_TemporaryKey.pfx
rename to Application/FeedCenter_1_TemporaryKey.pfx
diff --git a/FeedCenter_TemporaryKey.pfx b/Application/FeedCenter_TemporaryKey.pfx
similarity index 100%
rename from FeedCenter_TemporaryKey.pfx
rename to Application/FeedCenter_TemporaryKey.pfx
diff --git a/FeedErrorWindow.xaml b/Application/FeedErrorWindow.xaml
similarity index 100%
rename from FeedErrorWindow.xaml
rename to Application/FeedErrorWindow.xaml
diff --git a/FeedErrorWindow.xaml.cs b/Application/FeedErrorWindow.xaml.cs
similarity index 100%
rename from FeedErrorWindow.xaml.cs
rename to Application/FeedErrorWindow.xaml.cs
diff --git a/FeedItem.cs b/Application/FeedItem.cs
similarity index 100%
rename from FeedItem.cs
rename to Application/FeedItem.cs
diff --git a/FeedParsers/AtomParser.cs b/Application/FeedParsers/AtomParser.cs
similarity index 100%
rename from FeedParsers/AtomParser.cs
rename to Application/FeedParsers/AtomParser.cs
diff --git a/FeedParsers/FeedParserBase.cs b/Application/FeedParsers/FeedParserBase.cs
similarity index 100%
rename from FeedParsers/FeedParserBase.cs
rename to Application/FeedParsers/FeedParserBase.cs
diff --git a/FeedParsers/RdfParser.cs b/Application/FeedParsers/RdfParser.cs
similarity index 100%
rename from FeedParsers/RdfParser.cs
rename to Application/FeedParsers/RdfParser.cs
diff --git a/FeedParsers/RssParser.cs b/Application/FeedParsers/RssParser.cs
similarity index 100%
rename from FeedParsers/RssParser.cs
rename to Application/FeedParsers/RssParser.cs
diff --git a/Feeds/Category.cs b/Application/Feeds/Category.cs
similarity index 100%
rename from Feeds/Category.cs
rename to Application/Feeds/Category.cs
diff --git a/Feeds/Feed.cs b/Application/Feeds/Feed.cs
similarity index 100%
rename from Feeds/Feed.cs
rename to Application/Feeds/Feed.cs
diff --git a/Feeds/FeedAction.cs b/Application/Feeds/FeedAction.cs
similarity index 100%
rename from Feeds/FeedAction.cs
rename to Application/Feeds/FeedAction.cs
diff --git a/Feeds/FeedItem.cs b/Application/Feeds/FeedItem.cs
similarity index 100%
rename from Feeds/FeedItem.cs
rename to Application/Feeds/FeedItem.cs
diff --git a/Libraries/System.Data.SqlServerCe.Entity.dll b/Application/Libraries/System.Data.SqlServerCe.Entity.dll
similarity index 100%
rename from Libraries/System.Data.SqlServerCe.Entity.dll
rename to Application/Libraries/System.Data.SqlServerCe.Entity.dll
diff --git a/Libraries/System.Data.SqlServerCe.dll b/Application/Libraries/System.Data.SqlServerCe.dll
similarity index 100%
rename from Libraries/System.Data.SqlServerCe.dll
rename to Application/Libraries/System.Data.SqlServerCe.dll
diff --git a/Libraries/amd64/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest b/Application/Libraries/amd64/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
similarity index 100%
rename from Libraries/amd64/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
rename to Application/Libraries/amd64/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
diff --git a/Libraries/amd64/Microsoft.VC90.CRT/msvcr90.dll b/Application/Libraries/amd64/Microsoft.VC90.CRT/msvcr90.dll
similarity index 100%
rename from Libraries/amd64/Microsoft.VC90.CRT/msvcr90.dll
rename to Application/Libraries/amd64/Microsoft.VC90.CRT/msvcr90.dll
diff --git a/Libraries/amd64/sqlceca40.dll b/Application/Libraries/amd64/sqlceca40.dll
similarity index 100%
rename from Libraries/amd64/sqlceca40.dll
rename to Application/Libraries/amd64/sqlceca40.dll
diff --git a/Libraries/amd64/sqlcecompact40.dll b/Application/Libraries/amd64/sqlcecompact40.dll
similarity index 100%
rename from Libraries/amd64/sqlcecompact40.dll
rename to Application/Libraries/amd64/sqlcecompact40.dll
diff --git a/Libraries/amd64/sqlceer40EN.dll b/Application/Libraries/amd64/sqlceer40EN.dll
similarity index 100%
rename from Libraries/amd64/sqlceer40EN.dll
rename to Application/Libraries/amd64/sqlceer40EN.dll
diff --git a/Libraries/amd64/sqlceme40.dll b/Application/Libraries/amd64/sqlceme40.dll
similarity index 100%
rename from Libraries/amd64/sqlceme40.dll
rename to Application/Libraries/amd64/sqlceme40.dll
diff --git a/Libraries/amd64/sqlceqp40.dll b/Application/Libraries/amd64/sqlceqp40.dll
similarity index 100%
rename from Libraries/amd64/sqlceqp40.dll
rename to Application/Libraries/amd64/sqlceqp40.dll
diff --git a/Libraries/amd64/sqlcese40.dll b/Application/Libraries/amd64/sqlcese40.dll
similarity index 100%
rename from Libraries/amd64/sqlcese40.dll
rename to Application/Libraries/amd64/sqlcese40.dll
diff --git a/Libraries/x86/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest b/Application/Libraries/x86/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
similarity index 100%
rename from Libraries/x86/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
rename to Application/Libraries/x86/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
diff --git a/Libraries/x86/Microsoft.VC90.CRT/msvcr90.dll b/Application/Libraries/x86/Microsoft.VC90.CRT/msvcr90.dll
similarity index 100%
rename from Libraries/x86/Microsoft.VC90.CRT/msvcr90.dll
rename to Application/Libraries/x86/Microsoft.VC90.CRT/msvcr90.dll
diff --git a/Libraries/x86/sqlceca40.dll b/Application/Libraries/x86/sqlceca40.dll
similarity index 100%
rename from Libraries/x86/sqlceca40.dll
rename to Application/Libraries/x86/sqlceca40.dll
diff --git a/Libraries/x86/sqlcecompact40.dll b/Application/Libraries/x86/sqlcecompact40.dll
similarity index 100%
rename from Libraries/x86/sqlcecompact40.dll
rename to Application/Libraries/x86/sqlcecompact40.dll
diff --git a/Libraries/x86/sqlceer40EN.dll b/Application/Libraries/x86/sqlceer40EN.dll
similarity index 100%
rename from Libraries/x86/sqlceer40EN.dll
rename to Application/Libraries/x86/sqlceer40EN.dll
diff --git a/Libraries/x86/sqlceme40.dll b/Application/Libraries/x86/sqlceme40.dll
similarity index 100%
rename from Libraries/x86/sqlceme40.dll
rename to Application/Libraries/x86/sqlceme40.dll
diff --git a/Libraries/x86/sqlceqp40.dll b/Application/Libraries/x86/sqlceqp40.dll
similarity index 100%
rename from Libraries/x86/sqlceqp40.dll
rename to Application/Libraries/x86/sqlceqp40.dll
diff --git a/Libraries/x86/sqlcese40.dll b/Application/Libraries/x86/sqlcese40.dll
similarity index 100%
rename from Libraries/x86/sqlcese40.dll
rename to Application/Libraries/x86/sqlcese40.dll
diff --git a/MainWindow.xaml b/Application/MainWindow.xaml
similarity index 100%
rename from MainWindow.xaml
rename to Application/MainWindow.xaml
diff --git a/MainWindow.xaml.cs b/Application/MainWindow.xaml.cs
similarity index 100%
rename from MainWindow.xaml.cs
rename to Application/MainWindow.xaml.cs
diff --git a/Model.Context.cs b/Application/Model.Context.cs
similarity index 100%
rename from Model.Context.cs
rename to Application/Model.Context.cs
diff --git a/Model.Context.tt b/Application/Model.Context.tt
similarity index 100%
rename from Model.Context.tt
rename to Application/Model.Context.tt
diff --git a/Model.Designer.cs b/Application/Model.Designer.cs
similarity index 100%
rename from Model.Designer.cs
rename to Application/Model.Designer.cs
diff --git a/Model.cs b/Application/Model.cs
similarity index 100%
rename from Model.cs
rename to Application/Model.cs
diff --git a/Model.edmx b/Application/Model.edmx
similarity index 100%
rename from Model.edmx
rename to Application/Model.edmx
diff --git a/Model.tt b/Application/Model.tt
similarity index 100%
rename from Model.tt
rename to Application/Model.tt
diff --git a/NotificationIcon.cs b/Application/NotificationIcon.cs
similarity index 100%
rename from NotificationIcon.cs
rename to Application/NotificationIcon.cs
diff --git a/Options/AboutOptionsPanel.xaml b/Application/Options/AboutOptionsPanel.xaml
similarity index 100%
rename from Options/AboutOptionsPanel.xaml
rename to Application/Options/AboutOptionsPanel.xaml
diff --git a/Options/AboutOptionsPanel.xaml.cs b/Application/Options/AboutOptionsPanel.xaml.cs
similarity index 100%
rename from Options/AboutOptionsPanel.xaml.cs
rename to Application/Options/AboutOptionsPanel.xaml.cs
diff --git a/Options/BulkFeedWindow.xaml b/Application/Options/BulkFeedWindow.xaml
similarity index 100%
rename from Options/BulkFeedWindow.xaml
rename to Application/Options/BulkFeedWindow.xaml
diff --git a/Options/BulkFeedWindow.xaml.cs b/Application/Options/BulkFeedWindow.xaml.cs
similarity index 100%
rename from Options/BulkFeedWindow.xaml.cs
rename to Application/Options/BulkFeedWindow.xaml.cs
diff --git a/Options/CategoryWindow.xaml b/Application/Options/CategoryWindow.xaml
similarity index 100%
rename from Options/CategoryWindow.xaml
rename to Application/Options/CategoryWindow.xaml
diff --git a/Options/CategoryWindow.xaml.cs b/Application/Options/CategoryWindow.xaml.cs
similarity index 100%
rename from Options/CategoryWindow.xaml.cs
rename to Application/Options/CategoryWindow.xaml.cs
diff --git a/Options/DisplayOptionsPanel.xaml b/Application/Options/DisplayOptionsPanel.xaml
similarity index 100%
rename from Options/DisplayOptionsPanel.xaml
rename to Application/Options/DisplayOptionsPanel.xaml
diff --git a/Options/DisplayOptionsPanel.xaml.cs b/Application/Options/DisplayOptionsPanel.xaml.cs
similarity index 100%
rename from Options/DisplayOptionsPanel.xaml.cs
rename to Application/Options/DisplayOptionsPanel.xaml.cs
diff --git a/Options/FeedWindow.xaml b/Application/Options/FeedWindow.xaml
similarity index 100%
rename from Options/FeedWindow.xaml
rename to Application/Options/FeedWindow.xaml
diff --git a/Options/FeedWindow.xaml.cs b/Application/Options/FeedWindow.xaml.cs
similarity index 100%
rename from Options/FeedWindow.xaml.cs
rename to Application/Options/FeedWindow.xaml.cs
diff --git a/Options/FeedsOptionsPanel.xaml b/Application/Options/FeedsOptionsPanel.xaml
similarity index 100%
rename from Options/FeedsOptionsPanel.xaml
rename to Application/Options/FeedsOptionsPanel.xaml
diff --git a/Options/FeedsOptionsPanel.xaml.cs b/Application/Options/FeedsOptionsPanel.xaml.cs
similarity index 100%
rename from Options/FeedsOptionsPanel.xaml.cs
rename to Application/Options/FeedsOptionsPanel.xaml.cs
diff --git a/Options/GeneralOptionsPanel.xaml b/Application/Options/GeneralOptionsPanel.xaml
similarity index 100%
rename from Options/GeneralOptionsPanel.xaml
rename to Application/Options/GeneralOptionsPanel.xaml
diff --git a/Options/GeneralOptionsPanel.xaml.cs b/Application/Options/GeneralOptionsPanel.xaml.cs
similarity index 100%
rename from Options/GeneralOptionsPanel.xaml.cs
rename to Application/Options/GeneralOptionsPanel.xaml.cs
diff --git a/Options/Options.cs b/Application/Options/Options.cs
similarity index 100%
rename from Options/Options.cs
rename to Application/Options/Options.cs
diff --git a/Options/OptionsPanelBase.cs b/Application/Options/OptionsPanelBase.cs
similarity index 100%
rename from Options/OptionsPanelBase.cs
rename to Application/Options/OptionsPanelBase.cs
diff --git a/Options/OptionsWindow.xaml b/Application/Options/OptionsWindow.xaml
similarity index 100%
rename from Options/OptionsWindow.xaml
rename to Application/Options/OptionsWindow.xaml
diff --git a/Options/OptionsWindow.xaml.cs b/Application/Options/OptionsWindow.xaml.cs
similarity index 100%
rename from Options/OptionsWindow.xaml.cs
rename to Application/Options/OptionsWindow.xaml.cs
diff --git a/Options/ReadingOptionsPanel.xaml b/Application/Options/ReadingOptionsPanel.xaml
similarity index 100%
rename from Options/ReadingOptionsPanel.xaml
rename to Application/Options/ReadingOptionsPanel.xaml
diff --git a/Options/ReadingOptionsPanel.xaml.cs b/Application/Options/ReadingOptionsPanel.xaml.cs
similarity index 100%
rename from Options/ReadingOptionsPanel.xaml.cs
rename to Application/Options/ReadingOptionsPanel.xaml.cs
diff --git a/Options/UpdateOptionsPanel.xaml b/Application/Options/UpdateOptionsPanel.xaml
similarity index 100%
rename from Options/UpdateOptionsPanel.xaml
rename to Application/Options/UpdateOptionsPanel.xaml
diff --git a/Options/UpdateOptionsPanel.xaml.cs b/Application/Options/UpdateOptionsPanel.xaml.cs
similarity index 100%
rename from Options/UpdateOptionsPanel.xaml.cs
rename to Application/Options/UpdateOptionsPanel.xaml.cs
diff --git a/Properties/AssemblyInfo.cs b/Application/Properties/AssemblyInfo.cs
similarity index 100%
rename from Properties/AssemblyInfo.cs
rename to Application/Properties/AssemblyInfo.cs
diff --git a/Properties/DataSources/FeedCenterEntities.datasource b/Application/Properties/DataSources/FeedCenterEntities.datasource
similarity index 100%
rename from Properties/DataSources/FeedCenterEntities.datasource
rename to Application/Properties/DataSources/FeedCenterEntities.datasource
diff --git a/Properties/Resources.Designer.cs b/Application/Properties/Resources.Designer.cs
similarity index 100%
rename from Properties/Resources.Designer.cs
rename to Application/Properties/Resources.Designer.cs
diff --git a/Properties/Resources.resx b/Application/Properties/Resources.resx
similarity index 100%
rename from Properties/Resources.resx
rename to Application/Properties/Resources.resx
diff --git a/Properties/Settings.Designer.cs b/Application/Properties/Settings.Designer.cs
similarity index 100%
rename from Properties/Settings.Designer.cs
rename to Application/Properties/Settings.Designer.cs
diff --git a/Properties/Settings.settings b/Application/Properties/Settings.settings
similarity index 100%
rename from Properties/Settings.settings
rename to Application/Properties/Settings.settings
diff --git a/Properties/app.manifest b/Application/Properties/app.manifest
similarity index 100%
rename from Properties/app.manifest
rename to Application/Properties/app.manifest
diff --git a/Resources/Application.ico b/Application/Resources/Application.ico
similarity index 100%
rename from Resources/Application.ico
rename to Application/Resources/Application.ico
diff --git a/Resources/Comments-edit.ico b/Application/Resources/Comments-edit.ico
similarity index 100%
rename from Resources/Comments-edit.ico
rename to Application/Resources/Comments-edit.ico
diff --git a/Resources/Compile.ico b/Application/Resources/Compile.ico
similarity index 100%
rename from Resources/Compile.ico
rename to Application/Resources/Compile.ico
diff --git a/Resources/Left.ico b/Application/Resources/Left.ico
similarity index 100%
rename from Resources/Left.ico
rename to Application/Resources/Left.ico
diff --git a/Resources/News.ico b/Application/Resources/News.ico
similarity index 100%
rename from Resources/News.ico
rename to Application/Resources/News.ico
diff --git a/Resources/Right.ico b/Application/Resources/Right.ico
similarity index 100%
rename from Resources/Right.ico
rename to Application/Resources/Right.ico
diff --git a/Resources/Rss-Download.ico b/Application/Resources/Rss-Download.ico
similarity index 100%
rename from Resources/Rss-Download.ico
rename to Application/Resources/Rss-Download.ico
diff --git a/Resources/Warning.ico b/Application/Resources/Warning.ico
similarity index 100%
rename from Resources/Warning.ico
rename to Application/Resources/Warning.ico
diff --git a/Scripts/CreateDatabase.sqlce b/Application/Scripts/CreateDatabase.sqlce
similarity index 100%
rename from Scripts/CreateDatabase.sqlce
rename to Application/Scripts/CreateDatabase.sqlce
diff --git a/Scripts/DatabaseUpdate_1.sqlce b/Application/Scripts/DatabaseUpdate_1.sqlce
similarity index 100%
rename from Scripts/DatabaseUpdate_1.sqlce
rename to Application/Scripts/DatabaseUpdate_1.sqlce
diff --git a/Scripts/DatabaseUpdate_2.sqlce b/Application/Scripts/DatabaseUpdate_2.sqlce
similarity index 100%
rename from Scripts/DatabaseUpdate_2.sqlce
rename to Application/Scripts/DatabaseUpdate_2.sqlce
diff --git a/Scripts/DatabaseUpdate_3.sqlce b/Application/Scripts/DatabaseUpdate_3.sqlce
similarity index 100%
rename from Scripts/DatabaseUpdate_3.sqlce
rename to Application/Scripts/DatabaseUpdate_3.sqlce
diff --git a/Scripts/DatabaseUpdate_4.sqlce b/Application/Scripts/DatabaseUpdate_4.sqlce
similarity index 100%
rename from Scripts/DatabaseUpdate_4.sqlce
rename to Application/Scripts/DatabaseUpdate_4.sqlce
diff --git a/Scripts/DatabaseUpdate_5.sqlce b/Application/Scripts/DatabaseUpdate_5.sqlce
similarity index 100%
rename from Scripts/DatabaseUpdate_5.sqlce
rename to Application/Scripts/DatabaseUpdate_5.sqlce
diff --git a/Scripts/DatabaseUpdate_6.sqlce b/Application/Scripts/DatabaseUpdate_6.sqlce
similarity index 100%
rename from Scripts/DatabaseUpdate_6.sqlce
rename to Application/Scripts/DatabaseUpdate_6.sqlce
diff --git a/Setting.cs b/Application/Setting.cs
similarity index 100%
rename from Setting.cs
rename to Application/Setting.cs
diff --git a/SettingsStore.cs b/Application/SettingsStore.cs
similarity index 100%
rename from SettingsStore.cs
rename to Application/SettingsStore.cs
diff --git a/SplashWindow.xaml b/Application/SplashWindow.xaml
similarity index 100%
rename from SplashWindow.xaml
rename to Application/SplashWindow.xaml
diff --git a/SplashWindow.xaml.cs b/Application/SplashWindow.xaml.cs
similarity index 100%
rename from SplashWindow.xaml.cs
rename to Application/SplashWindow.xaml.cs
diff --git a/SqlSettingsProvider.cs b/Application/SqlSettingsProvider.cs
similarity index 100%
rename from SqlSettingsProvider.cs
rename to Application/SqlSettingsProvider.cs
diff --git a/Style.xaml b/Application/Style.xaml
similarity index 100%
rename from Style.xaml
rename to Application/Style.xaml
diff --git a/VersionCheck.cs b/Application/VersionCheck.cs
similarity index 100%
rename from VersionCheck.cs
rename to Application/VersionCheck.cs
diff --git a/app.config b/Application/app.config
similarity index 100%
rename from app.config
rename to Application/app.config
diff --git a/packages.config b/Application/packages.config
similarity index 100%
rename from packages.config
rename to Application/packages.config