diff --git a/dxfeed-graal-net-api.sln b/dxfeed-graal-net-api.sln
index 6b6e004e..26145b42 100644
--- a/dxfeed-graal-net-api.sln
+++ b/dxfeed-graal-net-api.sln
@@ -4,56 +4,76 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DxFeed.Graal.Net", "src\DxF
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DxFeed.Graal.Net.Tools", "src\DxFeed.Graal.Net.Tools\DxFeed.Graal.Net.Tools.csproj", "{1F8765D9-1ED0-40EC-8239-B3E9F7BDF38C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D8A3B3E7-CFFD-4113-862D-B9E9E7FF0BA5}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DxFeed.Graal.Net.Tests", "tests\DxFeed.Graal.Net.Tests\DxFeed.Graal.Net.Tests.csproj", "{7F07BB95-9DB6-4331-BCCF-FBF441F8F3E2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{C4490D74-2970-4A1B-8178-A724A06B140A}"
+	ProjectSection(SolutionItems) = preProject
+		samples\Directory.Build.props = samples\Directory.Build.props
+		samples\dxfeed.properties = samples\dxfeed.properties
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrintQuoteEvents", "samples\PrintQuoteEvents\PrintQuoteEvents.csproj", "{73597E04-D8A8-4991-A759-7F886CBE2A8F}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "API", "API", "{BABA2486-F8A5-4608-A79F-D03247FE2332}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DxFeedConnect", "samples\DxFeedConnect\DxFeedConnect.csproj", "{2A8B6037-09FF-40DC-868F-A0ED54A46287}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthSample", "samples\API\AuthSample\AuthSample.csproj", "{B9088D14-10F6-4D88-876D-062B9F6494AB}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D8A3B3E7-CFFD-4113-862D-B9E9E7FF0BA5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectSample", "samples\API\ConnectSample\ConnectSample.csproj", "{2A8B6037-09FF-40DC-868F-A0ED54A46287}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WriteTapeFile", "samples\WriteTapeFile\WriteTapeFile.csproj", "{F06FDF6E-6BE8-4A72-A834-62AB1BAA6B7A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrintQuoteEventsSample", "samples\API\PrintQuoteEventsSample\PrintQuoteEventsSample.csproj", "{73597E04-D8A8-4991-A759-7F886CBE2A8F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvertTapeFile", "samples\ConvertTapeFile\ConvertTapeFile.csproj", "{F9369083-EB43-455F-8944-07246E4FE6AC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuoteAndTradeSample", "samples\API\QuoteAndTradeSample\QuoteAndTradeSample.csproj", "{ECD5E041-0FBF-475E-82A6-DE6384EF25A0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DxFeedFileParser", "samples\DxFeedFileParser\DxFeedFileParser.csproj", "{62ED5ABC-B2A7-4CE3-8AE1-25AF185B47E9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReconnectSample", "samples\API\ReconnectSample\ReconnectSample.csproj", "{C457D53F-A033-465C-B250-A6CC60D02F98}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DxFeedSample", "samples\DxFeedSample\DxFeedSample.csproj", "{ECD5E041-0FBF-475E-82A6-DE6384EF25A0}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Candle", "Candle", "{F7C44172-08CC-4CF9-97A8-01460C2AB759}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CandleSample", "samples\CandleSample\CandleSample.csproj", "{CECAB17A-9DBE-4A4E-8556-5747AB170714}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CandleDataSample", "samples\Candle\CandleDataSample\CandleDataSample.csproj", "{2567935E-FEFB-470A-BF17-7A883735C4BF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DxFeedIpfConnect", "samples\DxFeedIpfConnect\DxFeedIpfConnect.csproj", "{62206DAF-999F-437A-AC18-1217ED14EB52}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CandleSample", "samples\Candle\CandleSample\CandleSample.csproj", "{CECAB17A-9DBE-4A4E-8556-5747AB170714}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DxFeedLiveIpfSample", "samples\DxFeedLiveIpfSample\DxFeedLiveIpfSample.csproj", "{C2F0FF7C-4675-4D5F-AE90-0E8DA33A1EB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FetchDailyCandlesSample", "samples\Candle\FetchDailyCandlesSample\FetchDailyCandlesSample.csproj", "{0797D7A4-3572-457B-AAD9-3F26098D4BDD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FetchDailyCandles", "samples\FetchDailyCandles\FetchDailyCandles.csproj", "{0797D7A4-3572-457B-AAD9-3F26098D4BDD}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Console", "Console", "{6E5A386D-1FB6-45BE-A80E-E29CA4AC697E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScheduleSample", "samples\ScheduleSample\ScheduleSample.csproj", "{119E7BB3-4B97-4824-9CA7-0D4C9B57590D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LastEventConsoleSample", "samples\Console\LastEventConsoleSample\LastEventConsoleSample.csproj", "{0CD0E240-687A-46A7-B343-BA8A6549A216}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DxFeedReconnectSample", "samples\DxFeedReconnectSample\DxFeedReconnectSample.csproj", "{C457D53F-A033-465C-B250-A6CC60D02F98}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "File", "File", "{D3E3A3FE-5F34-40DE-A8F2-7640F7C77BD2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleAuthSample", "samples\SimpleAuthSample\SimpleAuthSample.csproj", "{B9088D14-10F6-4D88-876D-062B9F6494AB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvertTapeFileSample", "samples\File\ConvertTapeFileSample\ConvertTapeFileSample.csproj", "{F9369083-EB43-455F-8944-07246E4FE6AC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CandleDataResponseReader", "samples\CandleDataResponseReader\CandleDataResponseReader.csproj", "{2567935E-FEFB-470A-BF17-7A883735C4BF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileParserSample", "samples\File\FileParserSample\FileParserSample.csproj", "{62ED5ABC-B2A7-4CE3-8AE1-25AF185B47E9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarketDepthModelSample", "samples\UI\MarketDepthModelSample\MarketDepthModelSample.csproj", "{930B1039-B76C-42C5-AD0F-9FA1A1FC9D84}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WriteTapeFileSample", "samples\File\WriteTapeFileSample\WriteTapeFileSample.csproj", "{F06FDF6E-6BE8-4A72-A834-62AB1BAA6B7A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CandleChartSample", "samples\UI\CandleChartSample\CandleChartSample.csproj", "{B74E8A86-1AB7-4B36-AED3-292CDD95BF90}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IPF", "IPF", "{01C0CC82-3B56-434C-B133-4CAA5B3BFE70}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IpfLiveSample", "samples\IPF\IpfLiveSample\IpfLiveSample.csproj", "{C2F0FF7C-4675-4D5F-AE90-0E8DA33A1EB8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IpfSample", "samples\IPF\IpfSample\IpfSample.csproj", "{62206DAF-999F-437A-AC18-1217ED14EB52}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IncOrderSnapshotSample", "samples\IncOrderSnapshotSample\IncOrderSnapshotSample.csproj", "{9B758A5C-8AA1-4560-A7CF-EF375B9A1E4C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OptionChainSample", "samples\IPF\OptionChainSample\OptionChainSample.csproj", "{7E7BF3A7-C564-4B82-AAD6-6C1D1BCE3F19}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultipleMarketDepthSample", "samples\MultipleMarketDepthSample\MultipleMarketDepthSample.csproj", "{C8F5013F-7F40-46D2-92AD-6B593524A1D0}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Model", "Model", "{2D069CF7-FE52-487B-8AF9-1A7EB0B296FD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IncOrderSnapshotSample", "samples\Model\IncOrderSnapshotSample\IncOrderSnapshotSample.csproj", "{9B758A5C-8AA1-4560-A7CF-EF375B9A1E4C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultipleMarketDepthSample", "samples\Model\MultipleMarketDepthSample\MultipleMarketDepthSample.csproj", "{C8F5013F-7F40-46D2-92AD-6B593524A1D0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Schedule", "Schedule", "{774DD1AE-2931-44CC-8AF2-F28955230507}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScheduleSample", "samples\Schedule\ScheduleSample\ScheduleSample.csproj", "{119E7BB3-4B97-4824-9CA7-0D4C9B57590D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{5F74BD34-C2D4-436B-8243-FB0F3BB9F0AC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DXFeedOptionChain", "samples\DXFeedOptionChain\DXFeedOptionChain.csproj", "{7E7BF3A7-C564-4B82-AAD6-6C1D1BCE3F19}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CandleChartSample", "samples\UI\CandleChartSample\CandleChartSample.csproj", "{B74E8A86-1AB7-4B36-AED3-292CDD95BF90}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LastEventConsoleSample", "samples\LastEventConsoleSample\LastEventConsoleSample.csproj", "{0CD0E240-687A-46A7-B343-BA8A6549A216}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarketDepthModelSample", "samples\UI\MarketDepthModelSample\MarketDepthModelSample.csproj", "{930B1039-B76C-42C5-AD0F-9FA1A1FC9D84}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PriceLevelBookSample", "samples\UI\PriceLevelBookSample\PriceLevelBookSample.csproj", "{A5B1FE68-8943-4340-BFEC-6D1B40823493}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Simple", "Simple", "{55801FC9-1025-47A2-8365-E996DB66D6DC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -158,28 +178,36 @@ Global
 		{A5B1FE68-8943-4340-BFEC-6D1B40823493}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{73597E04-D8A8-4991-A759-7F886CBE2A8F} = {C4490D74-2970-4A1B-8178-A724A06B140A}
-		{2A8B6037-09FF-40DC-868F-A0ED54A46287} = {C4490D74-2970-4A1B-8178-A724A06B140A}
 		{7F07BB95-9DB6-4331-BCCF-FBF441F8F3E2} = {D8A3B3E7-CFFD-4113-862D-B9E9E7FF0BA5}
-		{F06FDF6E-6BE8-4A72-A834-62AB1BAA6B7A} = {C4490D74-2970-4A1B-8178-A724A06B140A}
-		{F9369083-EB43-455F-8944-07246E4FE6AC} = {C4490D74-2970-4A1B-8178-A724A06B140A}
-		{62ED5ABC-B2A7-4CE3-8AE1-25AF185B47E9} = {C4490D74-2970-4A1B-8178-A724A06B140A}
-		{ECD5E041-0FBF-475E-82A6-DE6384EF25A0} = {C4490D74-2970-4A1B-8178-A724A06B140A}
-		{CECAB17A-9DBE-4A4E-8556-5747AB170714} = {C4490D74-2970-4A1B-8178-A724A06B140A}
-		{62206DAF-999F-437A-AC18-1217ED14EB52} = {C4490D74-2970-4A1B-8178-A724A06B140A}
-		{C2F0FF7C-4675-4D5F-AE90-0E8DA33A1EB8} = {C4490D74-2970-4A1B-8178-A724A06B140A}
-		{0797D7A4-3572-457B-AAD9-3F26098D4BDD} = {C4490D74-2970-4A1B-8178-A724A06B140A}
-		{119E7BB3-4B97-4824-9CA7-0D4C9B57590D} = {C4490D74-2970-4A1B-8178-A724A06B140A}
-		{C457D53F-A033-465C-B250-A6CC60D02F98} = {C4490D74-2970-4A1B-8178-A724A06B140A}
-		{B9088D14-10F6-4D88-876D-062B9F6494AB} = {C4490D74-2970-4A1B-8178-A724A06B140A}
-		{2567935E-FEFB-470A-BF17-7A883735C4BF} = {C4490D74-2970-4A1B-8178-A724A06B140A}
-		{9B758A5C-8AA1-4560-A7CF-EF375B9A1E4C} = {C4490D74-2970-4A1B-8178-A724A06B140A}
-		{C8F5013F-7F40-46D2-92AD-6B593524A1D0} = {C4490D74-2970-4A1B-8178-A724A06B140A}
 		{5F74BD34-C2D4-436B-8243-FB0F3BB9F0AC} = {C4490D74-2970-4A1B-8178-A724A06B140A}
 		{B74E8A86-1AB7-4B36-AED3-292CDD95BF90} = {5F74BD34-C2D4-436B-8243-FB0F3BB9F0AC}
 		{930B1039-B76C-42C5-AD0F-9FA1A1FC9D84} = {5F74BD34-C2D4-436B-8243-FB0F3BB9F0AC}
-		{7E7BF3A7-C564-4B82-AAD6-6C1D1BCE3F19} = {C4490D74-2970-4A1B-8178-A724A06B140A}
-		{0CD0E240-687A-46A7-B343-BA8A6549A216} = {C4490D74-2970-4A1B-8178-A724A06B140A}
 		{A5B1FE68-8943-4340-BFEC-6D1B40823493} = {5F74BD34-C2D4-436B-8243-FB0F3BB9F0AC}
+		{55801FC9-1025-47A2-8365-E996DB66D6DC} = {C4490D74-2970-4A1B-8178-A724A06B140A}
+		{BABA2486-F8A5-4608-A79F-D03247FE2332} = {C4490D74-2970-4A1B-8178-A724A06B140A}
+		{6E5A386D-1FB6-45BE-A80E-E29CA4AC697E} = {C4490D74-2970-4A1B-8178-A724A06B140A}
+		{01C0CC82-3B56-434C-B133-4CAA5B3BFE70} = {C4490D74-2970-4A1B-8178-A724A06B140A}
+		{774DD1AE-2931-44CC-8AF2-F28955230507} = {C4490D74-2970-4A1B-8178-A724A06B140A}
+		{2A8B6037-09FF-40DC-868F-A0ED54A46287} = {BABA2486-F8A5-4608-A79F-D03247FE2332}
+		{ECD5E041-0FBF-475E-82A6-DE6384EF25A0} = {BABA2486-F8A5-4608-A79F-D03247FE2332}
+		{0CD0E240-687A-46A7-B343-BA8A6549A216} = {6E5A386D-1FB6-45BE-A80E-E29CA4AC697E}
+		{7E7BF3A7-C564-4B82-AAD6-6C1D1BCE3F19} = {01C0CC82-3B56-434C-B133-4CAA5B3BFE70}
+		{C2F0FF7C-4675-4D5F-AE90-0E8DA33A1EB8} = {01C0CC82-3B56-434C-B133-4CAA5B3BFE70}
+		{62206DAF-999F-437A-AC18-1217ED14EB52} = {01C0CC82-3B56-434C-B133-4CAA5B3BFE70}
+		{119E7BB3-4B97-4824-9CA7-0D4C9B57590D} = {774DD1AE-2931-44CC-8AF2-F28955230507}
+		{C457D53F-A033-465C-B250-A6CC60D02F98} = {BABA2486-F8A5-4608-A79F-D03247FE2332}
+		{D3E3A3FE-5F34-40DE-A8F2-7640F7C77BD2} = {C4490D74-2970-4A1B-8178-A724A06B140A}
+		{F7C44172-08CC-4CF9-97A8-01460C2AB759} = {C4490D74-2970-4A1B-8178-A724A06B140A}
+		{2D069CF7-FE52-487B-8AF9-1A7EB0B296FD} = {C4490D74-2970-4A1B-8178-A724A06B140A}
+		{F9369083-EB43-455F-8944-07246E4FE6AC} = {D3E3A3FE-5F34-40DE-A8F2-7640F7C77BD2}
+		{F06FDF6E-6BE8-4A72-A834-62AB1BAA6B7A} = {D3E3A3FE-5F34-40DE-A8F2-7640F7C77BD2}
+		{62ED5ABC-B2A7-4CE3-8AE1-25AF185B47E9} = {D3E3A3FE-5F34-40DE-A8F2-7640F7C77BD2}
+		{9B758A5C-8AA1-4560-A7CF-EF375B9A1E4C} = {2D069CF7-FE52-487B-8AF9-1A7EB0B296FD}
+		{C8F5013F-7F40-46D2-92AD-6B593524A1D0} = {2D069CF7-FE52-487B-8AF9-1A7EB0B296FD}
+		{2567935E-FEFB-470A-BF17-7A883735C4BF} = {F7C44172-08CC-4CF9-97A8-01460C2AB759}
+		{CECAB17A-9DBE-4A4E-8556-5747AB170714} = {F7C44172-08CC-4CF9-97A8-01460C2AB759}
+		{0797D7A4-3572-457B-AAD9-3F26098D4BDD} = {F7C44172-08CC-4CF9-97A8-01460C2AB759}
+		{B9088D14-10F6-4D88-876D-062B9F6494AB} = {BABA2486-F8A5-4608-A79F-D03247FE2332}
+		{73597E04-D8A8-4991-A759-7F886CBE2A8F} = {BABA2486-F8A5-4608-A79F-D03247FE2332}
 	EndGlobalSection
 EndGlobal
diff --git a/samples/API/AuthSample/AuthSample.csproj b/samples/API/AuthSample/AuthSample.csproj
new file mode 100644
index 00000000..61718a1f
--- /dev/null
+++ b/samples/API/AuthSample/AuthSample.csproj
@@ -0,0 +1,3 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+</Project>
diff --git a/samples/SimpleAuthSample/Program.cs b/samples/API/AuthSample/Program.cs
similarity index 100%
rename from samples/SimpleAuthSample/Program.cs
rename to samples/API/AuthSample/Program.cs
diff --git a/samples/API/ConnectSample/ConnectSample.csproj b/samples/API/ConnectSample/ConnectSample.csproj
new file mode 100644
index 00000000..61718a1f
--- /dev/null
+++ b/samples/API/ConnectSample/ConnectSample.csproj
@@ -0,0 +1,3 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+</Project>
diff --git a/samples/DxFeedConnect/Program.cs b/samples/API/ConnectSample/Program.cs
similarity index 98%
rename from samples/DxFeedConnect/Program.cs
rename to samples/API/ConnectSample/Program.cs
index 66fa225e..f2f768f1 100644
--- a/samples/DxFeedConnect/Program.cs
+++ b/samples/API/ConnectSample/Program.cs
@@ -24,7 +24,7 @@ private static void PrintUsage()
         var eventTypeNames = ReflectionUtil.CreateTypesString(DXEndpoint.GetEventTypes());
         var usageString = $@"
 Usage:
-DxFeedConnect <address> <types> <symbols> [<time>]
+<address> <types> <symbols> [<time>]
 
 Where:
     address - The address to connect to retrieve data (remote host or local tape file).
diff --git a/samples/API/PrintQuoteEventsSample/PrintQuoteEventsSample.csproj b/samples/API/PrintQuoteEventsSample/PrintQuoteEventsSample.csproj
new file mode 100644
index 00000000..61718a1f
--- /dev/null
+++ b/samples/API/PrintQuoteEventsSample/PrintQuoteEventsSample.csproj
@@ -0,0 +1,3 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+</Project>
diff --git a/samples/PrintQuoteEvents/Program.cs b/samples/API/PrintQuoteEventsSample/Program.cs
similarity index 100%
rename from samples/PrintQuoteEvents/Program.cs
rename to samples/API/PrintQuoteEventsSample/Program.cs
diff --git a/samples/DxFeedSample/Program.cs b/samples/API/QuoteAndTradeSample/Program.cs
similarity index 98%
rename from samples/DxFeedSample/Program.cs
rename to samples/API/QuoteAndTradeSample/Program.cs
index f2e95393..c0c4b02b 100644
--- a/samples/DxFeedSample/Program.cs
+++ b/samples/API/QuoteAndTradeSample/Program.cs
@@ -24,7 +24,7 @@ public static async Task Main(string[] args)
         {
             Console.WriteLine($@"
 Usage:
-DxFeedSample <symbol>
+<symbol>
 
 Where:
     symbol - Is security symbol (e.g. IBM, AAPL, SPX etc.).");
diff --git a/samples/API/QuoteAndTradeSample/QuoteAndTradeSample.csproj b/samples/API/QuoteAndTradeSample/QuoteAndTradeSample.csproj
new file mode 100644
index 00000000..61718a1f
--- /dev/null
+++ b/samples/API/QuoteAndTradeSample/QuoteAndTradeSample.csproj
@@ -0,0 +1,3 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+</Project>
diff --git a/samples/DxFeedReconnectSample/Program.cs b/samples/API/ReconnectSample/Program.cs
similarity index 100%
rename from samples/DxFeedReconnectSample/Program.cs
rename to samples/API/ReconnectSample/Program.cs
diff --git a/samples/API/ReconnectSample/ReconnectSample.csproj b/samples/API/ReconnectSample/ReconnectSample.csproj
new file mode 100644
index 00000000..61718a1f
--- /dev/null
+++ b/samples/API/ReconnectSample/ReconnectSample.csproj
@@ -0,0 +1,3 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+</Project>
diff --git a/samples/CandleDataResponseReader/AbstractTimeSeriesMap.cs b/samples/Candle/CandleDataSample/AbstractTimeSeriesMap.cs
similarity index 100%
rename from samples/CandleDataResponseReader/AbstractTimeSeriesMap.cs
rename to samples/Candle/CandleDataSample/AbstractTimeSeriesMap.cs
diff --git a/samples/Candle/CandleDataSample/CandleDataSample.csproj b/samples/Candle/CandleDataSample/CandleDataSample.csproj
new file mode 100644
index 00000000..1fe610c1
--- /dev/null
+++ b/samples/Candle/CandleDataSample/CandleDataSample.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <PackageReference Include="CsvHelper" Version="33.0.1" />
+  </ItemGroup>
+
+</Project>
diff --git a/samples/CandleDataResponseReader/CandleMap.cs b/samples/Candle/CandleDataSample/CandleMap.cs
similarity index 100%
rename from samples/CandleDataResponseReader/CandleMap.cs
rename to samples/Candle/CandleDataSample/CandleMap.cs
diff --git a/samples/CandleDataResponseReader/Program.cs b/samples/Candle/CandleDataSample/Program.cs
similarity index 100%
rename from samples/CandleDataResponseReader/Program.cs
rename to samples/Candle/CandleDataSample/Program.cs
diff --git a/samples/CandleDataResponseReader/TimeAndSaleMap.cs b/samples/Candle/CandleDataSample/TimeAndSaleMap.cs
similarity index 100%
rename from samples/CandleDataResponseReader/TimeAndSaleMap.cs
rename to samples/Candle/CandleDataSample/TimeAndSaleMap.cs
diff --git a/samples/Candle/CandleSample/CandleSample.csproj b/samples/Candle/CandleSample/CandleSample.csproj
new file mode 100644
index 00000000..61718a1f
--- /dev/null
+++ b/samples/Candle/CandleSample/CandleSample.csproj
@@ -0,0 +1,3 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+</Project>
diff --git a/samples/CandleSample/Program.cs b/samples/Candle/CandleSample/Program.cs
similarity index 100%
rename from samples/CandleSample/Program.cs
rename to samples/Candle/CandleSample/Program.cs
diff --git a/samples/Candle/FetchDailyCandlesSample/FetchDailyCandlesSample.csproj b/samples/Candle/FetchDailyCandlesSample/FetchDailyCandlesSample.csproj
new file mode 100644
index 00000000..61718a1f
--- /dev/null
+++ b/samples/Candle/FetchDailyCandlesSample/FetchDailyCandlesSample.csproj
@@ -0,0 +1,3 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+</Project>
diff --git a/samples/FetchDailyCandles/Program.cs b/samples/Candle/FetchDailyCandlesSample/Program.cs
similarity index 98%
rename from samples/FetchDailyCandles/Program.cs
rename to samples/Candle/FetchDailyCandlesSample/Program.cs
index d99e6552..f6aadf4a 100644
--- a/samples/FetchDailyCandles/Program.cs
+++ b/samples/Candle/FetchDailyCandlesSample/Program.cs
@@ -20,7 +20,7 @@ internal abstract class FetchDailyCandles
     private static void PrintUsage() =>
         Console.WriteLine($@"
 Usage:
-FetchDailyCandles <symbol>
+<symbol>
 
 Where:
     symbol - Is security symbol (e.g. AAPL, IBM etc.).");
diff --git a/samples/CandleDataResponseReader/CandleDataResponseReader.csproj b/samples/CandleDataResponseReader/CandleDataResponseReader.csproj
deleted file mode 100644
index 230f0f7a..00000000
--- a/samples/CandleDataResponseReader/CandleDataResponseReader.csproj
+++ /dev/null
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../artifacts/Release/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="33.0.1" />
-  </ItemGroup>
-
-</Project>
diff --git a/samples/CandleSample/CandleSample.csproj b/samples/CandleSample/CandleSample.csproj
deleted file mode 100644
index 84084982..00000000
--- a/samples/CandleSample/CandleSample.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../artifacts/Release/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/Console/LastEventConsoleSample/LastEventConsoleSample.csproj b/samples/Console/LastEventConsoleSample/LastEventConsoleSample.csproj
new file mode 100644
index 00000000..61718a1f
--- /dev/null
+++ b/samples/Console/LastEventConsoleSample/LastEventConsoleSample.csproj
@@ -0,0 +1,3 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+</Project>
diff --git a/samples/LastEventConsoleSample/Program.cs b/samples/Console/LastEventConsoleSample/Program.cs
similarity index 94%
rename from samples/LastEventConsoleSample/Program.cs
rename to samples/Console/LastEventConsoleSample/Program.cs
index fd29c412..ac13d129 100644
--- a/samples/LastEventConsoleSample/Program.cs
+++ b/samples/Console/LastEventConsoleSample/Program.cs
@@ -38,8 +38,8 @@ private static async Task Main()
         // A particular application's use cases have to be studied to figure out what is optimal for this particular
         // application. If some events are known to be rarely needed and a small delay while accessing them can be
         // tolerated, then it is not worth configuring a permanent subscription for them. The code in this
-        // sample works using DXFeed.GetLastEventAsync method that will request the event from the upstream data provider
-        // if it is not present in the local in-memory cache.
+        // sample works using DXFeed.GetLastEventAsync method that will request the event from the upstream
+        // data provider if it is not present in the local in-memory cache.
 
         // There are multiple ways to specify a list of symbols. It is typically taken from an IPF file and its
         // specification consists of a URL to the file which has to contain ".ipf" in order to be recognized.
@@ -49,11 +49,10 @@ private static async Task Main()
         // The permanent subscription property "dxfeed.qd.subscribe.ticker" can be placed directly into the
         // "dxfeed.properties" file, eliminating the need for a custom DXEndpoint instance. In this example,
         // it is explicitly specified using the DXFeedEndpoint.Builder class. Note that the "connect" method
-        // is not used on DXEndpoint. This sample assumes that the "dxfeed.address" property is specified in the builder,
-        // establishing the connection automatically. Alternatively, "dxfeed.address" can also
-        // be specified in the "dxfeed.properties" file.
+        // is not used on DXEndpoint. This sample assumes that the "dxfeed.address" property is specified
+        // in the "dxfeed.properties", establishing the connection automatically.
+        // Alternatively, "dxfeed.address" can also be specified in the builder.
         var endpoint = DXEndpoint.NewBuilder()
-            .WithProperty("dxfeed.address", "demo.dxfeed.com:7300")
             .WithProperty("dxfeed.qd.subscribe.ticker", $"{records} {symbols}")
             .Build();
 
diff --git a/samples/ConvertTapeFile/ConvertTapeFile.csproj b/samples/ConvertTapeFile/ConvertTapeFile.csproj
deleted file mode 100644
index 3653d583..00000000
--- a/samples/ConvertTapeFile/ConvertTapeFile.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../artifacts/Release/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="ConvertTapeFile.in">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/DXFeedOptionChain/DXFeedOptionChain.csproj b/samples/DXFeedOptionChain/DXFeedOptionChain.csproj
deleted file mode 100644
index 84084982..00000000
--- a/samples/DXFeedOptionChain/DXFeedOptionChain.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../artifacts/Release/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
new file mode 100644
index 00000000..2f987e2b
--- /dev/null
+++ b/samples/Directory.Build.props
@@ -0,0 +1,26 @@
+<Project>
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <Nullable>enable</Nullable>
+    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
+    <SatelliteResourceLanguages>en-US;en</SatelliteResourceLanguages>
+    <CodeAnalysisRuleSet>$(SolutionDir)/StyleCop.xml</CodeAnalysisRuleSet>
+    <OutputPath>$(SolutionDir)/artifacts/$(Configuration)/Samples/</OutputPath>
+    <OutDir>$(OutputPath)</OutDir>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+    <BuildPassReferences>false</BuildPassReferences>
+    <AllowParallelCompileInReferencedProjects>false</AllowParallelCompileInReferencedProjects>
+    <UseCommonOutputDir>true</UseCommonOutputDir>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="$(SolutionDir)/src/DxFeed.Graal.Net/DxFeed.Graal.Net.csproj"/>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="$(SolutionDir)/samples/dxfeed.properties">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/DxFeedConnect/DxFeedConnect.csproj b/samples/DxFeedConnect/DxFeedConnect.csproj
deleted file mode 100644
index 84084982..00000000
--- a/samples/DxFeedConnect/DxFeedConnect.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../artifacts/Release/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/DxFeedFileParser/DxFeedFileParser.csproj b/samples/DxFeedFileParser/DxFeedFileParser.csproj
deleted file mode 100644
index 84084982..00000000
--- a/samples/DxFeedFileParser/DxFeedFileParser.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../artifacts/Release/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/DxFeedIpfConnect/DxFeedIpfConnect.csproj b/samples/DxFeedIpfConnect/DxFeedIpfConnect.csproj
deleted file mode 100644
index 678b85a0..00000000
--- a/samples/DxFeedIpfConnect/DxFeedIpfConnect.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../artifacts/Release/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="dxfeed.properties">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/DxFeedLiveIpfSample/DxFeedLiveIpfSample.csproj b/samples/DxFeedLiveIpfSample/DxFeedLiveIpfSample.csproj
deleted file mode 100644
index 84084982..00000000
--- a/samples/DxFeedLiveIpfSample/DxFeedLiveIpfSample.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../artifacts/Release/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/DxFeedReconnectSample/DxFeedReconnectSample.csproj b/samples/DxFeedReconnectSample/DxFeedReconnectSample.csproj
deleted file mode 100644
index 8e15492e..00000000
--- a/samples/DxFeedReconnectSample/DxFeedReconnectSample.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../artifacts/Debug/Samples/DxFeedReconnectSample/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../artifacts/Release/Samples/DxFeedReconnectSample/</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/DxFeedSample/DxFeedSample.csproj b/samples/DxFeedSample/DxFeedSample.csproj
deleted file mode 100644
index 678b85a0..00000000
--- a/samples/DxFeedSample/DxFeedSample.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../artifacts/Release/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="dxfeed.properties">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/DxFeedSample/dxfeed.properties b/samples/DxFeedSample/dxfeed.properties
deleted file mode 100644
index 9d935dcf..00000000
--- a/samples/DxFeedSample/dxfeed.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# Connection address for an endpoint with role Feed or OnDemandFeed.
-dxfeed.address=demo.dxfeed.com:7300
diff --git a/samples/FetchDailyCandles/FetchDailyCandles.csproj b/samples/FetchDailyCandles/FetchDailyCandles.csproj
deleted file mode 100644
index 678b85a0..00000000
--- a/samples/FetchDailyCandles/FetchDailyCandles.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../artifacts/Release/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="dxfeed.properties">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/FetchDailyCandles/dxfeed.properties b/samples/FetchDailyCandles/dxfeed.properties
deleted file mode 100644
index 9d935dcf..00000000
--- a/samples/FetchDailyCandles/dxfeed.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# Connection address for an endpoint with role Feed or OnDemandFeed.
-dxfeed.address=demo.dxfeed.com:7300
diff --git a/samples/ConvertTapeFile/ConvertTapeFile.in b/samples/File/ConvertTapeFileSample/ConvertTapeFile.in
similarity index 100%
rename from samples/ConvertTapeFile/ConvertTapeFile.in
rename to samples/File/ConvertTapeFileSample/ConvertTapeFile.in
diff --git a/samples/File/ConvertTapeFileSample/ConvertTapeFileSample.csproj b/samples/File/ConvertTapeFileSample/ConvertTapeFileSample.csproj
new file mode 100644
index 00000000..2bbacc71
--- /dev/null
+++ b/samples/File/ConvertTapeFileSample/ConvertTapeFileSample.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <ItemGroup>
+    <None Update="ConvertTapeFile.in">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>
diff --git a/samples/ConvertTapeFile/Program.cs b/samples/File/ConvertTapeFileSample/Program.cs
similarity index 100%
rename from samples/ConvertTapeFile/Program.cs
rename to samples/File/ConvertTapeFileSample/Program.cs
diff --git a/samples/File/FileParserSample/FileParserSample.csproj b/samples/File/FileParserSample/FileParserSample.csproj
new file mode 100644
index 00000000..61718a1f
--- /dev/null
+++ b/samples/File/FileParserSample/FileParserSample.csproj
@@ -0,0 +1,3 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+</Project>
diff --git a/samples/DxFeedFileParser/Program.cs b/samples/File/FileParserSample/Program.cs
similarity index 98%
rename from samples/DxFeedFileParser/Program.cs
rename to samples/File/FileParserSample/Program.cs
index a74a8b24..7e53d698 100644
--- a/samples/DxFeedFileParser/Program.cs
+++ b/samples/File/FileParserSample/Program.cs
@@ -22,7 +22,7 @@ private static void PrintUsage()
         var eventTypeNames = ReflectionUtil.CreateTypesString(DXEndpoint.GetEventTypes());
         var usageString = $@"
 Usage:
-DxFeedFileParser <file> <type> <symbol>
+<file> <type> <symbol>
 
 Where:
     file   - Is a file name.
diff --git a/samples/WriteTapeFile/Program.cs b/samples/File/WriteTapeFileSample/Program.cs
similarity index 100%
rename from samples/WriteTapeFile/Program.cs
rename to samples/File/WriteTapeFileSample/Program.cs
diff --git a/samples/File/WriteTapeFileSample/WriteTapeFileSample.csproj b/samples/File/WriteTapeFileSample/WriteTapeFileSample.csproj
new file mode 100644
index 00000000..61718a1f
--- /dev/null
+++ b/samples/File/WriteTapeFileSample/WriteTapeFileSample.csproj
@@ -0,0 +1,3 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+</Project>
diff --git a/samples/IPF/IpfLiveSample/IpfLiveSample.csproj b/samples/IPF/IpfLiveSample/IpfLiveSample.csproj
new file mode 100644
index 00000000..61718a1f
--- /dev/null
+++ b/samples/IPF/IpfLiveSample/IpfLiveSample.csproj
@@ -0,0 +1,3 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+</Project>
diff --git a/samples/DxFeedLiveIpfSample/Program.cs b/samples/IPF/IpfLiveSample/Program.cs
similarity index 100%
rename from samples/DxFeedLiveIpfSample/Program.cs
rename to samples/IPF/IpfLiveSample/Program.cs
diff --git a/samples/IPF/IpfSample/IpfSample.csproj b/samples/IPF/IpfSample/IpfSample.csproj
new file mode 100644
index 00000000..61718a1f
--- /dev/null
+++ b/samples/IPF/IpfSample/IpfSample.csproj
@@ -0,0 +1,3 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+</Project>
diff --git a/samples/DxFeedIpfConnect/Program.cs b/samples/IPF/IpfSample/Program.cs
similarity index 100%
rename from samples/DxFeedIpfConnect/Program.cs
rename to samples/IPF/IpfSample/Program.cs
diff --git a/samples/IPF/OptionChainSample/OptionChainSample.csproj b/samples/IPF/OptionChainSample/OptionChainSample.csproj
new file mode 100644
index 00000000..61718a1f
--- /dev/null
+++ b/samples/IPF/OptionChainSample/OptionChainSample.csproj
@@ -0,0 +1,3 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+</Project>
diff --git a/samples/DXFeedOptionChain/Program.cs b/samples/IPF/OptionChainSample/Program.cs
similarity index 97%
rename from samples/DXFeedOptionChain/Program.cs
rename to samples/IPF/OptionChainSample/Program.cs
index 7abd30e5..69e28e17 100644
--- a/samples/DXFeedOptionChain/Program.cs
+++ b/samples/IPF/OptionChainSample/Program.cs
@@ -22,7 +22,7 @@ public static async Task Main(string[] args)
     {
         if (args.Length != 5)
         {
-            Console.WriteLine("usage: DXFeedOptionChain <address> <ipf-file> <symbol> <nStrikes> <nMonths>");
+            Console.WriteLine("usage: <address> <ipf-file> <symbol> <nStrikes> <nMonths>");
             Console.WriteLine("       <address>  is endpoint address");
             Console.WriteLine("       <ipf-file> is name of instrument profiles file");
             Console.WriteLine("       <symbol>   is the product or underlying symbol");
diff --git a/samples/IncOrderSnapshotSample/IncOrderSnapshotSample.csproj b/samples/IncOrderSnapshotSample/IncOrderSnapshotSample.csproj
deleted file mode 100644
index 678b85a0..00000000
--- a/samples/IncOrderSnapshotSample/IncOrderSnapshotSample.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../artifacts/Release/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="dxfeed.properties">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/LastEventConsoleSample/LastEventConsoleSample.csproj b/samples/LastEventConsoleSample/LastEventConsoleSample.csproj
deleted file mode 100644
index 84084982..00000000
--- a/samples/LastEventConsoleSample/LastEventConsoleSample.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../artifacts/Release/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/Model/IncOrderSnapshotSample/IncOrderSnapshotSample.csproj b/samples/Model/IncOrderSnapshotSample/IncOrderSnapshotSample.csproj
new file mode 100644
index 00000000..61718a1f
--- /dev/null
+++ b/samples/Model/IncOrderSnapshotSample/IncOrderSnapshotSample.csproj
@@ -0,0 +1,3 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+</Project>
diff --git a/samples/IncOrderSnapshotSample/Program.cs b/samples/Model/IncOrderSnapshotSample/Program.cs
similarity index 95%
rename from samples/IncOrderSnapshotSample/Program.cs
rename to samples/Model/IncOrderSnapshotSample/Program.cs
index b480999e..611f87c3 100644
--- a/samples/IncOrderSnapshotSample/Program.cs
+++ b/samples/Model/IncOrderSnapshotSample/Program.cs
@@ -20,8 +20,6 @@ internal abstract class Program
 {
     public static async Task Main(string[] args)
     {
-        // Set the dxFeed server address.
-        SystemProperty.SetProperty("dxfeed.address", "dxfeed.address.com:7300");
         var symbol = "AAPL";
         var recordPrintLimit = 10;
 
diff --git a/samples/MultipleMarketDepthSample/MultipleMarketDepthModel.cs b/samples/Model/MultipleMarketDepthSample/MultipleMarketDepthModel.cs
similarity index 100%
rename from samples/MultipleMarketDepthSample/MultipleMarketDepthModel.cs
rename to samples/Model/MultipleMarketDepthSample/MultipleMarketDepthModel.cs
diff --git a/samples/Model/MultipleMarketDepthSample/MultipleMarketDepthSample.csproj b/samples/Model/MultipleMarketDepthSample/MultipleMarketDepthSample.csproj
new file mode 100644
index 00000000..61718a1f
--- /dev/null
+++ b/samples/Model/MultipleMarketDepthSample/MultipleMarketDepthSample.csproj
@@ -0,0 +1,3 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+</Project>
diff --git a/samples/MultipleMarketDepthSample/OrderBook.cs b/samples/Model/MultipleMarketDepthSample/OrderBook.cs
similarity index 100%
rename from samples/MultipleMarketDepthSample/OrderBook.cs
rename to samples/Model/MultipleMarketDepthSample/OrderBook.cs
diff --git a/samples/MultipleMarketDepthSample/Program.cs b/samples/Model/MultipleMarketDepthSample/Program.cs
similarity index 97%
rename from samples/MultipleMarketDepthSample/Program.cs
rename to samples/Model/MultipleMarketDepthSample/Program.cs
index c100c05d..d52e87d6 100644
--- a/samples/MultipleMarketDepthSample/Program.cs
+++ b/samples/Model/MultipleMarketDepthSample/Program.cs
@@ -22,7 +22,6 @@ internal abstract class Program
 {
     private static void Main(string[] args)
     {
-        SystemProperty.SetProperty("dxfeed.address", "demo.dxfeed.com:7300");
         var symbol = new IndexedEventSubscriptionSymbol("AAPL", OrderSource.ntv);
         var model = new MultipleMarketDepthModel<Order>.Builder()
             .WithFeed(DXFeed.GetInstance())
diff --git a/samples/MultipleMarketDepthSample/MultipleMarketDepthSample.csproj b/samples/MultipleMarketDepthSample/MultipleMarketDepthSample.csproj
deleted file mode 100644
index 678b85a0..00000000
--- a/samples/MultipleMarketDepthSample/MultipleMarketDepthSample.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../artifacts/Release/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="dxfeed.properties">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/PrintQuoteEvents/PrintQuoteEvents.csproj b/samples/PrintQuoteEvents/PrintQuoteEvents.csproj
deleted file mode 100644
index 678b85a0..00000000
--- a/samples/PrintQuoteEvents/PrintQuoteEvents.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../artifacts/Release/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="dxfeed.properties">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/PrintQuoteEvents/Properties/launchSettings.json b/samples/PrintQuoteEvents/Properties/launchSettings.json
deleted file mode 100644
index 7e764dfe..00000000
--- a/samples/PrintQuoteEvents/Properties/launchSettings.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "profiles": {
-    "Run": {
-      "commandName": "Project",
-      "commandLineArgs": "AAPL",
-      "environmentVariables": {
-      }
-    }
-  }
-}
diff --git a/samples/PrintQuoteEvents/dxfeed.properties b/samples/PrintQuoteEvents/dxfeed.properties
deleted file mode 100644
index 9d935dcf..00000000
--- a/samples/PrintQuoteEvents/dxfeed.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# Connection address for an endpoint with role Feed or OnDemandFeed.
-dxfeed.address=demo.dxfeed.com:7300
diff --git a/samples/ScheduleSample/Program.cs b/samples/Schedule/ScheduleSample/Program.cs
similarity index 100%
rename from samples/ScheduleSample/Program.cs
rename to samples/Schedule/ScheduleSample/Program.cs
diff --git a/samples/Schedule/ScheduleSample/ScheduleSample.csproj b/samples/Schedule/ScheduleSample/ScheduleSample.csproj
new file mode 100644
index 00000000..61718a1f
--- /dev/null
+++ b/samples/Schedule/ScheduleSample/ScheduleSample.csproj
@@ -0,0 +1,3 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+</Project>
diff --git a/samples/ScheduleSample/ScheduleSample.csproj b/samples/ScheduleSample/ScheduleSample.csproj
deleted file mode 100644
index 84084982..00000000
--- a/samples/ScheduleSample/ScheduleSample.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../artifacts/Release/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/SimpleAuthSample/SimpleAuthSample.csproj b/samples/SimpleAuthSample/SimpleAuthSample.csproj
deleted file mode 100644
index aede8065..00000000
--- a/samples/SimpleAuthSample/SimpleAuthSample.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../artifacts/Debug/Samples/SimpleAuthSample/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../artifacts/Release/Samples/SimpleAuthSample/</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/UI/CandleChartSample/CandleChartSample.csproj b/samples/UI/CandleChartSample/CandleChartSample.csproj
index cd9554f1..80cbdee3 100644
--- a/samples/UI/CandleChartSample/CandleChartSample.csproj
+++ b/samples/UI/CandleChartSample/CandleChartSample.csproj
@@ -1,35 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-    <Nullable>enable</Nullable>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-    <CodeAnalysisRuleSet>../../../StyleCop.xml</CodeAnalysisRuleSet>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../../artifacts/Release/Samples/</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.10"/>
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.10"/>
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.10"/>
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.10"/>
+    <PackageReference Include="Avalonia" Version="11.1.2" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.1.2" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.2"/>
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.2"/>
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.10"/>
-    <PackageReference Include="ScottPlot.Avalonia" Version="5.0.36"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.2"/>
+    <PackageReference Include="ScottPlot.Avalonia" Version="5.0.37"/>
   </ItemGroup>
 
 </Project>
diff --git a/samples/UI/CandleChartSample/MainWindow.axaml.cs b/samples/UI/CandleChartSample/MainWindow.axaml.cs
index c7367f6f..2b650465 100644
--- a/samples/UI/CandleChartSample/MainWindow.axaml.cs
+++ b/samples/UI/CandleChartSample/MainWindow.axaml.cs
@@ -39,7 +39,6 @@ public partial class MainWindow : Window
     /// </summary>
     public MainWindow()
     {
-        SystemProperty.SetProperty("dxfeed.address", "demo.dxfeed.com:7300");
         InitializeComponent();
         InitializePlot();
         InitializeModelBuilder();
diff --git a/samples/UI/MarketDepthModelSample/MainWindow.axaml.cs b/samples/UI/MarketDepthModelSample/MainWindow.axaml.cs
index 19f9bd31..52ea8c88 100644
--- a/samples/UI/MarketDepthModelSample/MainWindow.axaml.cs
+++ b/samples/UI/MarketDepthModelSample/MainWindow.axaml.cs
@@ -39,8 +39,6 @@ public partial class MainWindow : Window
     /// </summary>
     public MainWindow()
     {
-        SystemProperty.SetProperty("dxfeed.address", "demo.dxfeed.com:7300");
-
         InitializeComponent();
         BuyTable.Source = orders.BuyOrders;
         SellTable.Source = orders.SellOrders;
diff --git a/samples/UI/MarketDepthModelSample/MarketDepthModelSample.csproj b/samples/UI/MarketDepthModelSample/MarketDepthModelSample.csproj
index 8fed556f..59c3ca21 100644
--- a/samples/UI/MarketDepthModelSample/MarketDepthModelSample.csproj
+++ b/samples/UI/MarketDepthModelSample/MarketDepthModelSample.csproj
@@ -1,36 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-    <Nullable>enable</Nullable>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-    <CodeAnalysisRuleSet>../../../StyleCop.xml</CodeAnalysisRuleSet>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../../artifacts/Release/Samples/</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.10"/>
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.10"/>
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.10"/>
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.10"/>
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.10" />
+    <PackageReference Include="Avalonia" Version="11.1.2"/>
+    <PackageReference Include="Avalonia.Desktop" Version="11.1.2"/>
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.2"/>
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.2"/>
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.1.2" />
     <PackageReference Include="Avalonia.Controls.TreeDataGrid" Version="11.0.10" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.10"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.2"/>
   </ItemGroup>
 
 </Project>
diff --git a/samples/UI/PriceLevelBookSample/MainWindow.axaml.cs b/samples/UI/PriceLevelBookSample/MainWindow.axaml.cs
index 0193f938..e2f65d13 100644
--- a/samples/UI/PriceLevelBookSample/MainWindow.axaml.cs
+++ b/samples/UI/PriceLevelBookSample/MainWindow.axaml.cs
@@ -38,8 +38,6 @@ public partial class MainWindow : Window
     /// </summary>
     public MainWindow()
     {
-        SystemProperty.SetProperty("dxfeed.address", "demo.dxfeed.com:7300");
-
         InitializeComponent();
         BuyTable.Source = _priceLevels.BuyPriceLevels;
         SellTable.Source = _priceLevels.SellPriceLevels;
diff --git a/samples/UI/PriceLevelBookSample/PriceLevelBookSample.csproj b/samples/UI/PriceLevelBookSample/PriceLevelBookSample.csproj
index 6aa35a92..a4181e01 100644
--- a/samples/UI/PriceLevelBookSample/PriceLevelBookSample.csproj
+++ b/samples/UI/PriceLevelBookSample/PriceLevelBookSample.csproj
@@ -1,47 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-    <Nullable>enable</Nullable>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-    <CodeAnalysisRuleSet>../../../StyleCop.xml</CodeAnalysisRuleSet>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../../artifacts/Release/Samples/</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.10"/>
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.10"/>
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.10"/>
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.10"/>
-    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.10"/>
+    <PackageReference Include="Avalonia" Version="11.1.2"/>
+    <PackageReference Include="Avalonia.Desktop" Version="11.1.2"/>
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.2"/>
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.2"/>
+    <PackageReference Include="Avalonia.Controls.DataGrid" Version="11.1.2"/>
     <PackageReference Include="Avalonia.Controls.TreeDataGrid" Version="11.0.10"/>
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.10"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="App.axaml.cs">
-      <DependentUpon>App.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Update="MainWindow.axaml.cs">
-      <DependentUpon>MainWindow.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
+    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.1.2"/>
   </ItemGroup>
 
 </Project>
diff --git a/samples/WriteTapeFile/WriteTapeFile.csproj b/samples/WriteTapeFile/WriteTapeFile.csproj
deleted file mode 100644
index 84084982..00000000
--- a/samples/WriteTapeFile/WriteTapeFile.csproj
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>DxFeed.Graal.Net.Samples</RootNamespace>
-    <TargetFrameworks>net6.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>../../artifacts/Debug/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>../../artifacts/Release/Samples/</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\DxFeed.Graal.Net\DxFeed.Graal.Net.csproj"/>
-  </ItemGroup>
-
-</Project>
diff --git a/samples/DxFeedIpfConnect/dxfeed.properties b/samples/dxfeed.properties
similarity index 100%
rename from samples/DxFeedIpfConnect/dxfeed.properties
rename to samples/dxfeed.properties
diff --git a/src/DxFeed.Graal.Net.Tools/Properties/launchSettings.json b/src/DxFeed.Graal.Net.Tools/Properties/launchSettings.json
deleted file mode 100644
index 942b8188..00000000
--- a/src/DxFeed.Graal.Net.Tools/Properties/launchSettings.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/launchsettings.json",
-  "profiles": {
-    "Connect": {
-      "commandName": "Project",
-      "commandLineArgs": "connect demo.dxfeed.com:7300 Profile,Quote,Trade AAPL,IBM,MSFT,GOOG",
-      "environmentVariables": {
-      }
-    },
-    "Dump": {
-      "commandName": "Project",
-      "commandLineArgs": "dump tape.csv[speed=max]",
-      "environmentVariables": {
-      }
-    }
-  }
-}