diff --git a/Programs/examples/TestClient/Commands/CloneProfileCommand.cs b/Programs/examples/TestClient/Commands/Agent/CloneProfileCommand.cs
similarity index 100%
rename from Programs/examples/TestClient/Commands/CloneProfileCommand.cs
rename to Programs/examples/TestClient/Commands/Agent/CloneProfileCommand.cs
diff --git a/Programs/examples/TestClient/Commands/TouchCommand.cs b/Programs/examples/TestClient/Commands/Agent/TouchCommand.cs
similarity index 100%
rename from Programs/examples/TestClient/Commands/TouchCommand.cs
rename to Programs/examples/TestClient/Commands/Agent/TouchCommand.cs
diff --git a/Programs/examples/TestClient/Commands/WhoCommand.cs b/Programs/examples/TestClient/Commands/Agent/WhoCommand.cs
similarity index 100%
rename from Programs/examples/TestClient/Commands/WhoCommand.cs
rename to Programs/examples/TestClient/Commands/Agent/WhoCommand.cs
diff --git a/Programs/examples/TestClient/Commands/SearchEventsCommand.cs b/Programs/examples/TestClient/Commands/Directory/SearchEventsCommand.cs
similarity index 100%
rename from Programs/examples/TestClient/Commands/SearchEventsCommand.cs
rename to Programs/examples/TestClient/Commands/Directory/SearchEventsCommand.cs
diff --git a/Programs/examples/TestClient/Commands/ShowEventDetailsCommand.cs b/Programs/examples/TestClient/Commands/Directory/ShowEventDetailsCommand.cs
similarity index 100%
rename from Programs/examples/TestClient/Commands/ShowEventDetailsCommand.cs
rename to Programs/examples/TestClient/Commands/Directory/ShowEventDetailsCommand.cs
diff --git a/Programs/examples/TestClient/Commands/ScriptCommand.cs b/Programs/examples/TestClient/Commands/Inventory/ScriptCommand.cs
similarity index 100%
rename from Programs/examples/TestClient/Commands/ScriptCommand.cs
rename to Programs/examples/TestClient/Commands/Inventory/ScriptCommand.cs
diff --git a/Programs/examples/TestClient/Commands/TreeCommand.cs b/Programs/examples/TestClient/Commands/Inventory/TreeCommand.cs
similarity index 100%
rename from Programs/examples/TestClient/Commands/TreeCommand.cs
rename to Programs/examples/TestClient/Commands/Inventory/TreeCommand.cs
diff --git a/Programs/examples/TestClient/Commands/GoHome.cs b/Programs/examples/TestClient/Commands/Movement/GoHome.cs
similarity index 100%
rename from Programs/examples/TestClient/Commands/GoHome.cs
rename to Programs/examples/TestClient/Commands/Movement/GoHome.cs
diff --git a/Programs/examples/TestClient/Commands/GotoLandmark.cs b/Programs/examples/TestClient/Commands/Movement/GotoLandmark.cs
similarity index 100%
rename from Programs/examples/TestClient/Commands/GotoLandmark.cs
rename to Programs/examples/TestClient/Commands/Movement/GotoLandmark.cs
diff --git a/Programs/examples/TestClient/Commands/SleepCommand.cs b/Programs/examples/TestClient/Commands/System/SleepCommand.cs
similarity index 100%
rename from Programs/examples/TestClient/Commands/SleepCommand.cs
rename to Programs/examples/TestClient/Commands/System/SleepCommand.cs