diff --git a/src/test/java/school/redrover/APIJenkinsTest.java b/src/test/java/school/redrover/api/APIFreestyleProjectTest.java
similarity index 61%
rename from src/test/java/school/redrover/APIJenkinsTest.java
rename to src/test/java/school/redrover/api/APIFreestyleProjectTest.java
index 16c984c2a..43f42b7f3 100644
--- a/src/test/java/school/redrover/APIJenkinsTest.java
+++ b/src/test/java/school/redrover/api/APIFreestyleProjectTest.java
@@ -1,9 +1,8 @@
-package school.redrover;
+package school.redrover.api;
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import io.restassured.response.Response;
-import io.restassured.response.ResponseBody;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.APIBaseTest;
@@ -11,29 +10,12 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class APIJenkinsTest extends APIBaseTest {
+public class APIFreestyleProjectTest extends APIBaseTest {
 
-    @Test
-    public void jenkinsTest() {
-        RestAssured.given()
-                .log().all()// ← добавил что бы смотреть, что отправляю и что получаю(в конце лог)
-                .when()
-                .auth()
-                .preemptive()
-                .basic(userName, apiToken)
-                .when()
-                .get(jenkinsUrl + "api/json")
-                .then()
-                .log().all()
-                .statusCode(200);
-    }
-
-    @Test
-    public void testCreateFreestyleProjectWithValidName() {
-        Map<String, String> projectName = new HashMap<>();
-        projectName.put("name", "FreestyleProjectName");
+    private static final String PROJECT_NAME = "FreestyleProject";
+    private static final String NEW_PROJECT_NAME = "NewFreestyleProject";
 
-        String bodyFreestyleProjectXML = """
+    private static final String bodyXML = """
                 <project>
                     <keepDependencies>false</keepDependencies>
                     <properties/>
@@ -48,7 +30,12 @@ public void testCreateFreestyleProjectWithValidName() {
                     <publishers/>
                     <buildWrappers/>
                 </project>
-                """;
+            """;
+
+    @Test
+    public void testCreateWithValidName() {
+        Map<String, String> projectName = new HashMap<>();
+        projectName.put("name", PROJECT_NAME);
 
         RestAssured.given()
                 .log().all()
@@ -56,7 +43,7 @@ public void testCreateFreestyleProjectWithValidName() {
                 .baseUri(jenkinsUrl)
                 .contentType(ContentType.XML)
                 .queryParams(projectName)
-                .body(bodyFreestyleProjectXML)
+                .body(bodyXML)
                 .when()
                 .post("/createItem")
                 .then()
@@ -81,57 +68,48 @@ public void testCreateFreestyleProjectWithValidName() {
     }
 
     @Test
-    public void testCreatePiplineAndDisable() {
+    public void testRenameProject() {
         Map<String, String> projectName = new HashMap<>();
-        projectName.put("name", "Pipline");
-
-        String bodyPiplineXML = """
-                 <flow-definition plugin="workflow-job@1559.va_a_533730b_ea_d">
-                                          <keepDependencies>false</keepDependencies>
-                                          <properties/>
-                                          <triggers/>
-                                          <disabled>false</disabled>
-                                          </flow-definition>
-                """;
+        projectName.put("name", PROJECT_NAME);
 
         RestAssured.given()
+                .log().all()
                 .auth().preemptive().basic(userName, apiToken)
                 .baseUri(jenkinsUrl)
                 .contentType(ContentType.XML)
                 .queryParams(projectName)
-                .body(bodyPiplineXML)
+                .body(bodyXML)
                 .when()
                 .post("/createItem")
                 .then()
                 .log().all()
                 .statusCode(200);
 
-        Response response = RestAssured.given()
+        RestAssured.given()
                 .log().all()
                 .auth().preemptive().basic(userName, apiToken)
                 .baseUri(jenkinsUrl)
+                .contentType("application/x-www-form-urlencoded")
+                .queryParam("newName", NEW_PROJECT_NAME)
                 .when()
-                .post("job/%s/disable".formatted(projectName.get("name")))
+                .post("job/%s/confirmRename".formatted(projectName.get("name")))
                 .then()
                 .log().all()
-                .extract().response();
+                .statusCode(302);
 
-        String location = response.getHeader("Location");
-
-        Response getResponse = RestAssured.given()
+        Response response = RestAssured.given()
+                .log().all()
                 .auth().preemptive().basic(userName, apiToken)
                 .baseUri(jenkinsUrl)
                 .when()
-                .get(location)
+                .get("job/%s/api/json".formatted(NEW_PROJECT_NAME))
                 .then()
                 .log().all()
                 .statusCode(200)
                 .extract().response();
 
-        String responseBody = getResponse.getBody().asString();
-
-        Assert.assertEquals(response.getStatusCode(), 302);
-        Assert.assertEquals(getResponse.getStatusCode(), 200);
-        Assert.assertTrue(responseBody.contains("This project is currently disabled"));
+        String actualProjectName = response.jsonPath().getString("name");
+        Assert.assertEquals(actualProjectName, NEW_PROJECT_NAME);
     }
+
 }
diff --git a/src/test/java/school/redrover/api/APIJenkinsTest.java b/src/test/java/school/redrover/api/APIJenkinsTest.java
new file mode 100644
index 000000000..198006564
--- /dev/null
+++ b/src/test/java/school/redrover/api/APIJenkinsTest.java
@@ -0,0 +1,84 @@
+package school.redrover.api;
+
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import io.restassured.response.Response;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import school.redrover.common.APIBaseTest;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class APIJenkinsTest extends APIBaseTest {
+
+    @Test
+    public void jenkinsTest() {
+        RestAssured.given()
+                .log().all()// ← добавил что бы смотреть, что отправляю и что получаю(в конце лог)
+                .when()
+                .auth()
+                .preemptive()
+                .basic(userName, apiToken)
+                .when()
+                .get(jenkinsUrl + "api/json")
+                .then()
+                .log().all()
+                .statusCode(200);
+    }
+
+    @Test
+    public void testCreatePiplineAndDisable() {
+        Map<String, String> projectName = new HashMap<>();
+        projectName.put("name", "Pipline");
+
+        String bodyPiplineXML = """
+                 <flow-definition plugin="workflow-job@1559.va_a_533730b_ea_d">
+                                          <keepDependencies>false</keepDependencies>
+                                          <properties/>
+                                          <triggers/>
+                                          <disabled>false</disabled>
+                                          </flow-definition>
+                """;
+
+        RestAssured.given()
+                .auth().preemptive().basic(userName, apiToken)
+                .baseUri(jenkinsUrl)
+                .contentType(ContentType.XML)
+                .queryParams(projectName)
+                .body(bodyPiplineXML)
+                .when()
+                .post("/createItem")
+                .then()
+                .log().all()
+                .statusCode(200);
+
+        Response response = RestAssured.given()
+                .log().all()
+                .auth().preemptive().basic(userName, apiToken)
+                .baseUri(jenkinsUrl)
+                .when()
+                .post("job/%s/disable".formatted(projectName.get("name")))
+                .then()
+                .log().all()
+                .extract().response();
+
+        String location = response.getHeader("Location");
+
+        Response getResponse = RestAssured.given()
+                .auth().preemptive().basic(userName, apiToken)
+                .baseUri(jenkinsUrl)
+                .when()
+                .get(location)
+                .then()
+                .log().all()
+                .statusCode(200)
+                .extract().response();
+
+        String responseBody = getResponse.getBody().asString();
+
+        Assert.assertEquals(response.getStatusCode(), 302);
+        Assert.assertEquals(getResponse.getStatusCode(), 200);
+        Assert.assertTrue(responseBody.contains("This project is currently disabled"));
+    }
+}
diff --git a/src/test/java/school/redrover/APITest.java b/src/test/java/school/redrover/api/APITest.java
similarity index 98%
rename from src/test/java/school/redrover/APITest.java
rename to src/test/java/school/redrover/api/APITest.java
index 46ed678eb..64b108fce 100644
--- a/src/test/java/school/redrover/APITest.java
+++ b/src/test/java/school/redrover/api/APITest.java
@@ -1,4 +1,4 @@
-package school.redrover;
+package school.redrover.api;
 
 
 import com.google.common.net.HttpHeaders;
@@ -14,7 +14,6 @@
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
-import java.util.Base64;
 import java.util.List;
 import java.util.Objects;
 
diff --git a/src/test/java/school/redrover/common/BasePage.java b/src/test/java/school/redrover/common/BasePage.java
index d3522bd38..4b82cfaf3 100644
--- a/src/test/java/school/redrover/common/BasePage.java
+++ b/src/test/java/school/redrover/common/BasePage.java
@@ -5,15 +5,16 @@
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.PageFactory;
+import org.openqa.selenium.support.ui.ExpectedConditions;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
-import school.redrover.component.common.JenkinsVersionFooterDropdown;
-import school.redrover.component.common.SearchComponent;
-import school.redrover.component.common.UserAccountIconDropdown;
-import school.redrover.page.HomePage;
-import school.redrover.page.JenkinsManagementPage;
-import school.redrover.page.RestApiPage;
-import school.redrover.page.UserStatusPage;
+import school.redrover.ui.component.common.JenkinsVersionFooterDropdown;
+import school.redrover.ui.component.common.SearchComponent;
+import school.redrover.ui.component.common.UserAccountIconDropdown;
+import school.redrover.ui.page.HomePage;
+import school.redrover.ui.page.JenkinsManagementPage;
+import school.redrover.ui.page.RestApiPage;
+import school.redrover.ui.page.UserStatusPage;
 
 import java.util.Objects;
 
@@ -74,7 +75,7 @@ public String getLogoText() {
     }
 
     public SearchComponent clickSearchButton() {
-        searchButton.click();
+        getWait10().until(ExpectedConditions.visibilityOf(searchButton)).click();
 
         return new SearchComponent(getDriver()).waitUntilComponentLoad();
     }
diff --git a/src/test/java/school/redrover/common/CucumberTest.java b/src/test/java/school/redrover/common/CucumberTest.java
index ec10462d2..b539435f9 100644
--- a/src/test/java/school/redrover/common/CucumberTest.java
+++ b/src/test/java/school/redrover/common/CucumberTest.java
@@ -6,7 +6,7 @@
 
 @CucumberOptions(
         features = "src/test/resources/cucumber",
-        glue = {"school.redrover.cucumber", "school.redrover.common"},
+        glue = {"school.redrover.ui.cucumber", "school.redrover.common"},
         plugin = {"pretty"},
         tags = "not @ignore")
 public class CucumberTest extends AbstractTestNGCucumberTests {
diff --git a/src/test/java/school/redrover/common/filter/FilterForTestsTest.java b/src/test/java/school/redrover/common/filter/FilterForTestsTest.java
index b70506ed7..e9ad9a6b6 100644
--- a/src/test/java/school/redrover/common/filter/FilterForTestsTest.java
+++ b/src/test/java/school/redrover/common/filter/FilterForTestsTest.java
@@ -74,8 +74,8 @@ public void testModifiedTest() {
     public void testClassWithDependencies() {
         List<String> changedFiles = List.of("M=src/test/java/school/redrover/page/BaseProjectStatusPage.java");
         String dependenciesClasses =
-                "school.redrover.page.BaseProjectStatusPage=%s;".formatted(FakeTestClass.class.getName()) +
-                        "school.redrover.page.BaseProjectStatusPage=%s".formatted(FakeTestClass2.class.getName());
+                "school.redrover.ui.page.BaseProjectStatusPage=%s;".formatted(FakeTestClass.class.getName()) +
+                        "school.redrover.ui.page.BaseProjectStatusPage=%s".formatted(FakeTestClass2.class.getName());
 
         List<IMethodInstance> methodList = List.of(
                 new FilterMock.MethodInstanceImpl(FakeTestClass.class),
@@ -97,7 +97,7 @@ public void testClassWithDependencies() {
     public void testOneDependency() {
         List<String> changedFiles = List.of("M=src/test/java/school/redrover/page/ProjectStatusPage.java");
         String dependenciesClasses =
-                "school.redrover.page.ProjectStatusPage=%s;".formatted(FakeTestClass.class.getName());
+                "school.redrover.ui.page.ProjectStatusPage=%s;".formatted(FakeTestClass.class.getName());
 
         List<IMethodInstance> methodList = List.of(new FilterMock.MethodInstanceImpl(FakeTestClass.class));
 
@@ -115,8 +115,8 @@ public void testOneDependency() {
     public void testClassWithDependencyChain() {
         List<String> changedFiles = List.of("M=src/test/java/school/redrover/page/BaseProjectStatusPage.java");
         String dependenciesClasses =
-                        "school.redrover.page.BaseProjectStatusPage=school.redrover.page.ProjectStatusPage" +
-                        "school.redrover.page.ProjectStatusPage=%s".formatted(FakeTestClass.class.getName());
+                        "school.redrover.ui.page.BaseProjectStatusPage=school.redrover.ui.page.ProjectStatusPage" +
+                        "school.redrover.ui.page.ProjectStatusPage=%s".formatted(FakeTestClass.class.getName());
 
         List<IMethodInstance> methodList = List.of(
                 new FilterMock.MethodInstanceImpl(FakeTestClass.class)
diff --git a/src/test/java/school/redrover/BreadcrumbsDropDownTest.java b/src/test/java/school/redrover/ui/BreadcrumbsDropDownTest.java
similarity index 92%
rename from src/test/java/school/redrover/BreadcrumbsDropDownTest.java
rename to src/test/java/school/redrover/ui/BreadcrumbsDropDownTest.java
index 0f9075d8e..4cdba4ecf 100644
--- a/src/test/java/school/redrover/BreadcrumbsDropDownTest.java
+++ b/src/test/java/school/redrover/ui/BreadcrumbsDropDownTest.java
@@ -1,10 +1,10 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.FolderStatusPage;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.FolderStatusPage;
+import school.redrover.ui.page.HomePage;
 
 import java.util.List;
 
diff --git a/src/test/java/school/redrover/BuildHistoryAccessTest.java b/src/test/java/school/redrover/ui/BuildHistoryAccessTest.java
similarity index 92%
rename from src/test/java/school/redrover/BuildHistoryAccessTest.java
rename to src/test/java/school/redrover/ui/BuildHistoryAccessTest.java
index 976cac0e6..ca18a891d 100644
--- a/src/test/java/school/redrover/BuildHistoryAccessTest.java
+++ b/src/test/java/school/redrover/ui/BuildHistoryAccessTest.java
@@ -1,11 +1,11 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.BuildHistoryOfJenkinsPage;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.BuildHistoryOfJenkinsPage;
+import school.redrover.ui.page.HomePage;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/test/java/school/redrover/ConfigurationMatrixTest.java b/src/test/java/school/redrover/ui/ConfigurationMatrixTest.java
similarity index 93%
rename from src/test/java/school/redrover/ConfigurationMatrixTest.java
rename to src/test/java/school/redrover/ui/ConfigurationMatrixTest.java
index 00e633b1a..3f97089a4 100644
--- a/src/test/java/school/redrover/ConfigurationMatrixTest.java
+++ b/src/test/java/school/redrover/ui/ConfigurationMatrixTest.java
@@ -1,10 +1,10 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.FreestyleProjectConfigurationPage;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.FreestyleProjectConfigurationPage;
+import school.redrover.ui.page.HomePage;
 
 import java.util.List;
 
diff --git a/src/test/java/school/redrover/ConfigureAppearanceTest.java b/src/test/java/school/redrover/ui/ConfigureAppearanceTest.java
similarity index 95%
rename from src/test/java/school/redrover/ConfigureAppearanceTest.java
rename to src/test/java/school/redrover/ui/ConfigureAppearanceTest.java
index bce817ac0..f36526404 100644
--- a/src/test/java/school/redrover/ConfigureAppearanceTest.java
+++ b/src/test/java/school/redrover/ui/ConfigureAppearanceTest.java
@@ -1,9 +1,9 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.HomePage;
 
 
 public class ConfigureAppearanceTest extends BaseTest {
diff --git a/src/test/java/school/redrover/ConfigureSystemTest.java b/src/test/java/school/redrover/ui/ConfigureSystemTest.java
similarity index 99%
rename from src/test/java/school/redrover/ConfigureSystemTest.java
rename to src/test/java/school/redrover/ui/ConfigureSystemTest.java
index ced04b539..59e9a74aa 100644
--- a/src/test/java/school/redrover/ConfigureSystemTest.java
+++ b/src/test/java/school/redrover/ui/ConfigureSystemTest.java
@@ -1,10 +1,10 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.HomePage;
 
 import java.util.*;
 
diff --git a/src/test/java/school/redrover/CopyFieldTest.java b/src/test/java/school/redrover/ui/CopyFieldTest.java
similarity index 94%
rename from src/test/java/school/redrover/CopyFieldTest.java
rename to src/test/java/school/redrover/ui/CopyFieldTest.java
index 32561ff6a..7e50666eb 100644
--- a/src/test/java/school/redrover/CopyFieldTest.java
+++ b/src/test/java/school/redrover/ui/CopyFieldTest.java
@@ -1,9 +1,9 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.HomePage;
 
 import java.util.List;
 
diff --git a/src/test/java/school/redrover/CreateNewItemTest.java b/src/test/java/school/redrover/ui/CreateNewItemTest.java
similarity index 97%
rename from src/test/java/school/redrover/CreateNewItemTest.java
rename to src/test/java/school/redrover/ui/CreateNewItemTest.java
index 83d69ca46..09eb4eb79 100644
--- a/src/test/java/school/redrover/CreateNewItemTest.java
+++ b/src/test/java/school/redrover/ui/CreateNewItemTest.java
@@ -1,4 +1,4 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebElement;
@@ -8,9 +8,9 @@
 import org.testng.annotations.Test;
 import org.openqa.selenium.JavascriptExecutor;
 import school.redrover.common.BaseTest;
-import school.redrover.page.FreestyleProjectStatusPage;
-import school.redrover.page.HomePage;
-import school.redrover.page.NewItemPage;
+import school.redrover.ui.page.FreestyleProjectStatusPage;
+import school.redrover.ui.page.HomePage;
+import school.redrover.ui.page.NewItemPage;
 
 import java.time.Duration;
 import java.util.List;
diff --git a/src/test/java/school/redrover/CredentialsTest.java b/src/test/java/school/redrover/ui/CredentialsTest.java
similarity index 96%
rename from src/test/java/school/redrover/CredentialsTest.java
rename to src/test/java/school/redrover/ui/CredentialsTest.java
index 0704016ff..5466933f3 100644
--- a/src/test/java/school/redrover/CredentialsTest.java
+++ b/src/test/java/school/redrover/ui/CredentialsTest.java
@@ -1,10 +1,10 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.openqa.selenium.WebElement;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.HomePage;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/src/test/java/school/redrover/DashboardTest.java b/src/test/java/school/redrover/ui/DashboardTest.java
similarity index 99%
rename from src/test/java/school/redrover/DashboardTest.java
rename to src/test/java/school/redrover/ui/DashboardTest.java
index f9dae1032..7875f4bb5 100644
--- a/src/test/java/school/redrover/DashboardTest.java
+++ b/src/test/java/school/redrover/ui/DashboardTest.java
@@ -1,10 +1,10 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.*;
+import school.redrover.ui.page.*;
 
 import java.util.List;
 
diff --git a/src/test/java/school/redrover/DescriptionTest.java b/src/test/java/school/redrover/ui/DescriptionTest.java
similarity index 94%
rename from src/test/java/school/redrover/DescriptionTest.java
rename to src/test/java/school/redrover/ui/DescriptionTest.java
index d7d63476b..f742b4f75 100644
--- a/src/test/java/school/redrover/DescriptionTest.java
+++ b/src/test/java/school/redrover/ui/DescriptionTest.java
@@ -1,10 +1,10 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.HomePage;
 
 public class DescriptionTest extends BaseTest {
 
diff --git a/src/test/java/school/redrover/FolderConfigurationTest.java b/src/test/java/school/redrover/ui/FolderConfigurationTest.java
similarity index 99%
rename from src/test/java/school/redrover/FolderConfigurationTest.java
rename to src/test/java/school/redrover/ui/FolderConfigurationTest.java
index 4dcf2e062..f8940ba19 100644
--- a/src/test/java/school/redrover/FolderConfigurationTest.java
+++ b/src/test/java/school/redrover/ui/FolderConfigurationTest.java
@@ -1,9 +1,9 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.*;
+import school.redrover.ui.page.*;
 import java.util.Arrays;
 import java.util.List;
 
diff --git a/src/test/java/school/redrover/FolderManagementTest.java b/src/test/java/school/redrover/ui/FolderManagementTest.java
similarity index 98%
rename from src/test/java/school/redrover/FolderManagementTest.java
rename to src/test/java/school/redrover/ui/FolderManagementTest.java
index 56bfd452d..c4032f094 100644
--- a/src/test/java/school/redrover/FolderManagementTest.java
+++ b/src/test/java/school/redrover/ui/FolderManagementTest.java
@@ -1,10 +1,10 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.*;
+import school.redrover.ui.page.*;
 
 
 public class FolderManagementTest extends BaseTest {
diff --git a/src/test/java/school/redrover/FolderSettingsTest.java b/src/test/java/school/redrover/ui/FolderSettingsTest.java
similarity index 92%
rename from src/test/java/school/redrover/FolderSettingsTest.java
rename to src/test/java/school/redrover/ui/FolderSettingsTest.java
index 52db3cfff..ccb26acc9 100644
--- a/src/test/java/school/redrover/FolderSettingsTest.java
+++ b/src/test/java/school/redrover/ui/FolderSettingsTest.java
@@ -1,10 +1,10 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.FolderStatusPage;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.FolderStatusPage;
+import school.redrover.ui.page.HomePage;
 
 
 import java.util.List;
diff --git a/src/test/java/school/redrover/FolderTest.java b/src/test/java/school/redrover/ui/FolderTest.java
similarity index 98%
rename from src/test/java/school/redrover/FolderTest.java
rename to src/test/java/school/redrover/ui/FolderTest.java
index f3149b018..65c7f35bb 100644
--- a/src/test/java/school/redrover/FolderTest.java
+++ b/src/test/java/school/redrover/ui/FolderTest.java
@@ -1,10 +1,10 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.FolderStatusPage;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.FolderStatusPage;
+import school.redrover.ui.page.HomePage;
 
 import java.util.List;
 
diff --git a/src/test/java/school/redrover/FooterTest.java b/src/test/java/school/redrover/ui/FooterTest.java
similarity index 98%
rename from src/test/java/school/redrover/FooterTest.java
rename to src/test/java/school/redrover/ui/FooterTest.java
index 43a11dc5b..febbe5382 100644
--- a/src/test/java/school/redrover/FooterTest.java
+++ b/src/test/java/school/redrover/ui/FooterTest.java
@@ -1,10 +1,10 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
 import school.redrover.common.PageUtils;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.HomePage;
 import java.util.List;
 
 
diff --git a/src/test/java/school/redrover/FreestyleProjectTest.java b/src/test/java/school/redrover/ui/FreestyleProjectTest.java
similarity index 98%
rename from src/test/java/school/redrover/FreestyleProjectTest.java
rename to src/test/java/school/redrover/ui/FreestyleProjectTest.java
index b6e501354..32b70412a 100644
--- a/src/test/java/school/redrover/FreestyleProjectTest.java
+++ b/src/test/java/school/redrover/ui/FreestyleProjectTest.java
@@ -1,11 +1,11 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.FreestyleProjectConfigurationPage;
-import school.redrover.page.FreestyleProjectStatusPage;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.FreestyleProjectConfigurationPage;
+import school.redrover.ui.page.FreestyleProjectStatusPage;
+import school.redrover.ui.page.HomePage;
 import java.util.List;
 
 public class FreestyleProjectTest extends BaseTest {
diff --git a/src/test/java/school/redrover/HeaderTest.java b/src/test/java/school/redrover/ui/HeaderTest.java
similarity index 91%
rename from src/test/java/school/redrover/HeaderTest.java
rename to src/test/java/school/redrover/ui/HeaderTest.java
index eb5df8771..aee320bfa 100644
--- a/src/test/java/school/redrover/HeaderTest.java
+++ b/src/test/java/school/redrover/ui/HeaderTest.java
@@ -1,12 +1,12 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.interactions.Actions;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.FolderStatusPage;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.FolderStatusPage;
+import school.redrover.ui.page.HomePage;
 
 import java.util.List;
 
diff --git a/src/test/java/school/redrover/JenkinsManagementTest.java b/src/test/java/school/redrover/ui/JenkinsManagementTest.java
similarity index 98%
rename from src/test/java/school/redrover/JenkinsManagementTest.java
rename to src/test/java/school/redrover/ui/JenkinsManagementTest.java
index 378bc602c..955666bf9 100644
--- a/src/test/java/school/redrover/JenkinsManagementTest.java
+++ b/src/test/java/school/redrover/ui/JenkinsManagementTest.java
@@ -1,10 +1,10 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.HomePage;
 
 import java.util.List;
 
diff --git a/src/test/java/school/redrover/MultiConfigurationProjectTest.java b/src/test/java/school/redrover/ui/MultiConfigurationProjectTest.java
similarity index 98%
rename from src/test/java/school/redrover/MultiConfigurationProjectTest.java
rename to src/test/java/school/redrover/ui/MultiConfigurationProjectTest.java
index e75526112..cc538207b 100644
--- a/src/test/java/school/redrover/MultiConfigurationProjectTest.java
+++ b/src/test/java/school/redrover/ui/MultiConfigurationProjectTest.java
@@ -1,10 +1,10 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.*;
+import school.redrover.ui.page.*;
 
 
 public class MultiConfigurationProjectTest extends BaseTest {
diff --git a/src/test/java/school/redrover/MultibranchPipelineTest.java b/src/test/java/school/redrover/ui/MultibranchPipelineTest.java
similarity index 98%
rename from src/test/java/school/redrover/MultibranchPipelineTest.java
rename to src/test/java/school/redrover/ui/MultibranchPipelineTest.java
index 4c475f0a9..aac43e381 100644
--- a/src/test/java/school/redrover/MultibranchPipelineTest.java
+++ b/src/test/java/school/redrover/ui/MultibranchPipelineTest.java
@@ -1,11 +1,11 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.HomePage;
-import school.redrover.page.MultibranchProjectStatusPage;
+import school.redrover.ui.page.HomePage;
+import school.redrover.ui.page.MultibranchProjectStatusPage;
 
 import java.util.List;
 
diff --git a/src/test/java/school/redrover/NavigateToDashboardTest.java b/src/test/java/school/redrover/ui/NavigateToDashboardTest.java
similarity index 96%
rename from src/test/java/school/redrover/NavigateToDashboardTest.java
rename to src/test/java/school/redrover/ui/NavigateToDashboardTest.java
index ef4e38408..019350b94 100644
--- a/src/test/java/school/redrover/NavigateToDashboardTest.java
+++ b/src/test/java/school/redrover/ui/NavigateToDashboardTest.java
@@ -1,9 +1,9 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.HomePage;
 import java.util.List;
 
 public class NavigateToDashboardTest extends BaseTest {
diff --git a/src/test/java/school/redrover/NodeTest.java b/src/test/java/school/redrover/ui/NodeTest.java
similarity index 97%
rename from src/test/java/school/redrover/NodeTest.java
rename to src/test/java/school/redrover/ui/NodeTest.java
index 9930c80df..43d3f3201 100644
--- a/src/test/java/school/redrover/NodeTest.java
+++ b/src/test/java/school/redrover/ui/NodeTest.java
@@ -1,9 +1,9 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.HomePage;
 
 public class NodeTest extends BaseTest {
     private static final String EXP_NODE_NAME = "SecondNode";
diff --git a/src/test/java/school/redrover/OrganizationFolderConfigurationTest.java b/src/test/java/school/redrover/ui/OrganizationFolderConfigurationTest.java
similarity index 94%
rename from src/test/java/school/redrover/OrganizationFolderConfigurationTest.java
rename to src/test/java/school/redrover/ui/OrganizationFolderConfigurationTest.java
index c4a963392..9223771cd 100644
--- a/src/test/java/school/redrover/OrganizationFolderConfigurationTest.java
+++ b/src/test/java/school/redrover/ui/OrganizationFolderConfigurationTest.java
@@ -1,10 +1,10 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.HomePage;
-import school.redrover.page.OrganizationFolderStatusPage;
+import school.redrover.ui.page.HomePage;
+import school.redrover.ui.page.OrganizationFolderStatusPage;
 
 import java.util.List;
 
diff --git a/src/test/java/school/redrover/OrganizationFolderTest.java b/src/test/java/school/redrover/ui/OrganizationFolderTest.java
similarity index 94%
rename from src/test/java/school/redrover/OrganizationFolderTest.java
rename to src/test/java/school/redrover/ui/OrganizationFolderTest.java
index 7b9f90dc4..9d03df98a 100644
--- a/src/test/java/school/redrover/OrganizationFolderTest.java
+++ b/src/test/java/school/redrover/ui/OrganizationFolderTest.java
@@ -1,10 +1,10 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.HomePage;
-import school.redrover.page.OrganizationFolderStatusPage;
+import school.redrover.ui.page.HomePage;
+import school.redrover.ui.page.OrganizationFolderStatusPage;
 import java.util.List;
 
 
diff --git a/src/test/java/school/redrover/PipelineBuildTriggersTest.java b/src/test/java/school/redrover/ui/PipelineBuildTriggersTest.java
similarity index 91%
rename from src/test/java/school/redrover/PipelineBuildTriggersTest.java
rename to src/test/java/school/redrover/ui/PipelineBuildTriggersTest.java
index 85afff733..06ce638a1 100644
--- a/src/test/java/school/redrover/PipelineBuildTriggersTest.java
+++ b/src/test/java/school/redrover/ui/PipelineBuildTriggersTest.java
@@ -1,10 +1,10 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.openqa.selenium.*;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.HomePage;
 
 
 public class PipelineBuildTriggersTest extends BaseTest {
diff --git a/src/test/java/school/redrover/PipelineConfigurationTest.java b/src/test/java/school/redrover/ui/PipelineConfigurationTest.java
similarity index 97%
rename from src/test/java/school/redrover/PipelineConfigurationTest.java
rename to src/test/java/school/redrover/ui/PipelineConfigurationTest.java
index 93e8f4a4a..a2ddfaf1d 100644
--- a/src/test/java/school/redrover/PipelineConfigurationTest.java
+++ b/src/test/java/school/redrover/ui/PipelineConfigurationTest.java
@@ -1,11 +1,11 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.PipelineProjectConfigurationPage;
-import school.redrover.page.HomePage;
-import school.redrover.page.PipelineProjectStatusPage;
+import school.redrover.ui.page.PipelineProjectConfigurationPage;
+import school.redrover.ui.page.HomePage;
+import school.redrover.ui.page.PipelineProjectStatusPage;
 
 import java.util.List;
 
diff --git a/src/test/java/school/redrover/PipelineTest.java b/src/test/java/school/redrover/ui/PipelineTest.java
similarity index 98%
rename from src/test/java/school/redrover/PipelineTest.java
rename to src/test/java/school/redrover/ui/PipelineTest.java
index 577daaa03..e170e3ee6 100644
--- a/src/test/java/school/redrover/PipelineTest.java
+++ b/src/test/java/school/redrover/ui/PipelineTest.java
@@ -1,12 +1,12 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.HomePage;
-import school.redrover.page.PipelineProjectConfigurationPage;
-import school.redrover.page.PipelineProjectStatusPage;
+import school.redrover.ui.page.HomePage;
+import school.redrover.ui.page.PipelineProjectConfigurationPage;
+import school.redrover.ui.page.PipelineProjectStatusPage;
 
 import java.util.List;
 
diff --git a/src/test/java/school/redrover/SignInOutTest.java b/src/test/java/school/redrover/ui/SignInOutTest.java
similarity index 90%
rename from src/test/java/school/redrover/SignInOutTest.java
rename to src/test/java/school/redrover/ui/SignInOutTest.java
index 01a0a4423..7e25e2539 100644
--- a/src/test/java/school/redrover/SignInOutTest.java
+++ b/src/test/java/school/redrover/ui/SignInOutTest.java
@@ -1,11 +1,11 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
 import school.redrover.common.ProjectUtils;
-import school.redrover.page.HomePage;
-import school.redrover.page.LoginPage;
+import school.redrover.ui.page.HomePage;
+import school.redrover.ui.page.LoginPage;
 
 public class SignInOutTest extends BaseTest {
 
diff --git a/src/test/java/school/redrover/StatusAdminTest.java b/src/test/java/school/redrover/ui/StatusAdminTest.java
similarity index 93%
rename from src/test/java/school/redrover/StatusAdminTest.java
rename to src/test/java/school/redrover/ui/StatusAdminTest.java
index dd26f6477..29753483d 100644
--- a/src/test/java/school/redrover/StatusAdminTest.java
+++ b/src/test/java/school/redrover/ui/StatusAdminTest.java
@@ -1,9 +1,9 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.HomePage;
 
 public class StatusAdminTest extends BaseTest {
 
diff --git a/src/test/java/school/redrover/UserLoggedInTest.java b/src/test/java/school/redrover/ui/UserLoggedInTest.java
similarity index 96%
rename from src/test/java/school/redrover/UserLoggedInTest.java
rename to src/test/java/school/redrover/ui/UserLoggedInTest.java
index ad6ccf3e5..13584e0b5 100644
--- a/src/test/java/school/redrover/UserLoggedInTest.java
+++ b/src/test/java/school/redrover/ui/UserLoggedInTest.java
@@ -1,10 +1,10 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import org.testng.annotations.Ignore;
 import school.redrover.common.BaseTest;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.HomePage;
 
 
 public class UserLoggedInTest extends BaseTest {
diff --git a/src/test/java/school/redrover/UserTest.java b/src/test/java/school/redrover/ui/UserTest.java
similarity index 98%
rename from src/test/java/school/redrover/UserTest.java
rename to src/test/java/school/redrover/ui/UserTest.java
index e901e1c21..113ea77b8 100644
--- a/src/test/java/school/redrover/UserTest.java
+++ b/src/test/java/school/redrover/ui/UserTest.java
@@ -1,9 +1,9 @@
-package school.redrover;
+package school.redrover.ui;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 import school.redrover.common.BaseTest;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.HomePage;
 
 import java.util.List;
 
diff --git a/src/test/java/school/redrover/component/BaseComponent.java b/src/test/java/school/redrover/ui/component/BaseComponent.java
similarity index 91%
rename from src/test/java/school/redrover/component/BaseComponent.java
rename to src/test/java/school/redrover/ui/component/BaseComponent.java
index 9e63c0473..051c30acf 100644
--- a/src/test/java/school/redrover/component/BaseComponent.java
+++ b/src/test/java/school/redrover/ui/component/BaseComponent.java
@@ -1,4 +1,4 @@
-package school.redrover.component;
+package school.redrover.ui.component;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.PageFactory;
diff --git a/src/test/java/school/redrover/component/common/JenkinsVersionFooterDropdown.java b/src/test/java/school/redrover/ui/component/common/JenkinsVersionFooterDropdown.java
similarity index 90%
rename from src/test/java/school/redrover/component/common/JenkinsVersionFooterDropdown.java
rename to src/test/java/school/redrover/ui/component/common/JenkinsVersionFooterDropdown.java
index c0d34064b..12b0cc0a0 100644
--- a/src/test/java/school/redrover/component/common/JenkinsVersionFooterDropdown.java
+++ b/src/test/java/school/redrover/ui/component/common/JenkinsVersionFooterDropdown.java
@@ -1,10 +1,10 @@
-package school.redrover.component.common;
+package school.redrover.ui.component.common;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.ui.ExpectedConditions;
-import school.redrover.component.BaseComponent;
+import school.redrover.ui.component.BaseComponent;
 
 import java.util.List;
 
diff --git a/src/test/java/school/redrover/component/common/SearchComponent.java b/src/test/java/school/redrover/ui/component/common/SearchComponent.java
similarity index 92%
rename from src/test/java/school/redrover/component/common/SearchComponent.java
rename to src/test/java/school/redrover/ui/component/common/SearchComponent.java
index 6801812f0..6554c0fde 100644
--- a/src/test/java/school/redrover/component/common/SearchComponent.java
+++ b/src/test/java/school/redrover/ui/component/common/SearchComponent.java
@@ -1,13 +1,13 @@
-package school.redrover.component.common;
+package school.redrover.ui.component.common;
 
 import org.openqa.selenium.*;
 import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import school.redrover.common.PageUtils;
-import school.redrover.component.BaseComponent;
-import school.redrover.page.FreestyleProjectStatusPage;
-import school.redrover.page.UserStatusPage;
+import school.redrover.ui.component.BaseComponent;
+import school.redrover.ui.page.FreestyleProjectStatusPage;
+import school.redrover.ui.page.UserStatusPage;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -86,7 +86,7 @@ public boolean isNoResultsFound(String jobName) {
     }
 
     public List<String> getSearchResultsAndClose() {
-        getWait5().until(ExpectedConditions.presenceOfElementLocated(By.className("jenkins-command-palette__results__heading")));
+        getWait5().until(ExpectedConditions.visibilityOfElementLocated(By.className("jenkins-command-palette__results__heading")));
         List<String> searchResultsTexts = new ArrayList<>();
 
         for (WebElement element : searchResults) {
diff --git a/src/test/java/school/redrover/component/common/UserAccountIconDropdown.java b/src/test/java/school/redrover/ui/component/common/UserAccountIconDropdown.java
similarity index 88%
rename from src/test/java/school/redrover/component/common/UserAccountIconDropdown.java
rename to src/test/java/school/redrover/ui/component/common/UserAccountIconDropdown.java
index 2674801f1..a7caadafc 100644
--- a/src/test/java/school/redrover/component/common/UserAccountIconDropdown.java
+++ b/src/test/java/school/redrover/ui/component/common/UserAccountIconDropdown.java
@@ -1,13 +1,13 @@
-package school.redrover.component.common;
+package school.redrover.ui.component.common;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import school.redrover.common.PageUtils;
-import school.redrover.component.BaseComponent;
-import school.redrover.page.LoginPage;
-import school.redrover.page.UserStatusPage;
+import school.redrover.ui.component.BaseComponent;
+import school.redrover.ui.page.LoginPage;
+import school.redrover.ui.page.UserStatusPage;
 
 import java.util.function.Consumer;
 
diff --git a/src/test/java/school/redrover/component/project/status_page/sidebar/BaseSidebarComponent.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/BaseSidebarComponent.java
similarity index 87%
rename from src/test/java/school/redrover/component/project/status_page/sidebar/BaseSidebarComponent.java
rename to src/test/java/school/redrover/ui/component/project/status_page/sidebar/BaseSidebarComponent.java
index cf6bb4df6..e45e1780e 100644
--- a/src/test/java/school/redrover/component/project/status_page/sidebar/BaseSidebarComponent.java
+++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/BaseSidebarComponent.java
@@ -1,13 +1,13 @@
-package school.redrover.component.project.status_page.sidebar;
+package school.redrover.ui.component.project.status_page.sidebar;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import school.redrover.component.BaseComponent;
-import school.redrover.page.BaseProjectConfigurationPage;
-import school.redrover.page.BaseProjectStatusPage;
-import school.redrover.page.ProjectMovePage;
-import school.redrover.page.ProjectRenamingPage;
+import school.redrover.ui.page.ProjectMovePage;
+import school.redrover.ui.component.BaseComponent;
+import school.redrover.ui.page.BaseProjectConfigurationPage;
+import school.redrover.ui.page.BaseProjectStatusPage;
+import school.redrover.ui.page.ProjectRenamingPage;
 
 import java.util.function.Function;
 
diff --git a/src/test/java/school/redrover/component/project/status_page/sidebar/FolderSidebar.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/FolderSidebar.java
similarity index 86%
rename from src/test/java/school/redrover/component/project/status_page/sidebar/FolderSidebar.java
rename to src/test/java/school/redrover/ui/component/project/status_page/sidebar/FolderSidebar.java
index e85911b9c..b1fc1ed12 100644
--- a/src/test/java/school/redrover/component/project/status_page/sidebar/FolderSidebar.java
+++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/FolderSidebar.java
@@ -1,12 +1,12 @@
-package school.redrover.component.project.status_page.sidebar;
+package school.redrover.ui.component.project.status_page.sidebar;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.ui.ExpectedConditions;
-import school.redrover.page.*;
-import school.redrover.trait.project_sidebar.SidebarBuildHistoryTrait;
-import school.redrover.trait.project_sidebar.SidebarCredentialsTrait;
+import school.redrover.ui.page.*;
+import school.redrover.ui.trait.project_sidebar.SidebarBuildHistoryTrait;
+import school.redrover.ui.trait.project_sidebar.SidebarCredentialsTrait;
 
 
 public class FolderSidebar extends BaseSidebarComponent<FolderSidebar, FolderStatusPage, FolderConfigurationPage>
diff --git a/src/test/java/school/redrover/component/project/status_page/sidebar/FreestyleProjectSidebar.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/FreestyleProjectSidebar.java
similarity index 90%
rename from src/test/java/school/redrover/component/project/status_page/sidebar/FreestyleProjectSidebar.java
rename to src/test/java/school/redrover/ui/component/project/status_page/sidebar/FreestyleProjectSidebar.java
index 20649d091..41d267086 100644
--- a/src/test/java/school/redrover/component/project/status_page/sidebar/FreestyleProjectSidebar.java
+++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/FreestyleProjectSidebar.java
@@ -1,8 +1,8 @@
-package school.redrover.component.project.status_page.sidebar;
+package school.redrover.ui.component.project.status_page.sidebar;
 
 import org.openqa.selenium.WebDriver;
-import school.redrover.page.*;
-import school.redrover.trait.project_sidebar.*;
+import school.redrover.ui.page.*;
+import school.redrover.ui.trait.project_sidebar.*;
 
 
 public class FreestyleProjectSidebar extends BaseSidebarComponent<
diff --git a/src/test/java/school/redrover/component/project/status_page/sidebar/MultiBranchProjectSidebar.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/MultiBranchProjectSidebar.java
similarity index 72%
rename from src/test/java/school/redrover/component/project/status_page/sidebar/MultiBranchProjectSidebar.java
rename to src/test/java/school/redrover/ui/component/project/status_page/sidebar/MultiBranchProjectSidebar.java
index d6105e25b..70b6c5e48 100644
--- a/src/test/java/school/redrover/component/project/status_page/sidebar/MultiBranchProjectSidebar.java
+++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/MultiBranchProjectSidebar.java
@@ -1,9 +1,12 @@
-package school.redrover.component.project.status_page.sidebar;
+package school.redrover.ui.component.project.status_page.sidebar;
 
 import org.openqa.selenium.WebDriver;
-import school.redrover.page.*;
-import school.redrover.trait.project_sidebar.SidebarBuildHistoryTrait;
-import school.redrover.trait.project_sidebar.SidebarCredentialsTrait;
+import school.redrover.ui.page.MultiBranchProjectBuildHistoryPage;
+import school.redrover.ui.page.MultiBranchProjectCredentialsPage;
+import school.redrover.ui.page.MultibranchProjectConfigurationPage;
+import school.redrover.ui.page.MultibranchProjectStatusPage;
+import school.redrover.ui.trait.project_sidebar.SidebarBuildHistoryTrait;
+import school.redrover.ui.trait.project_sidebar.SidebarCredentialsTrait;
 
 
 public class MultiBranchProjectSidebar extends BaseSidebarComponent<
diff --git a/src/test/java/school/redrover/component/project/status_page/sidebar/MultiConfigProjectSidebar.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/MultiConfigProjectSidebar.java
similarity index 90%
rename from src/test/java/school/redrover/component/project/status_page/sidebar/MultiConfigProjectSidebar.java
rename to src/test/java/school/redrover/ui/component/project/status_page/sidebar/MultiConfigProjectSidebar.java
index 5112b8f39..324424295 100644
--- a/src/test/java/school/redrover/component/project/status_page/sidebar/MultiConfigProjectSidebar.java
+++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/MultiConfigProjectSidebar.java
@@ -1,8 +1,8 @@
-package school.redrover.component.project.status_page.sidebar;
+package school.redrover.ui.component.project.status_page.sidebar;
 
 import org.openqa.selenium.WebDriver;
-import school.redrover.page.*;
-import school.redrover.trait.project_sidebar.*;
+import school.redrover.ui.page.*;
+import school.redrover.ui.trait.project_sidebar.*;
 
 
 public class MultiConfigProjectSidebar extends BaseSidebarComponent<MultiConfigProjectSidebar, MultiConfigProjectStatusPage,
diff --git a/src/test/java/school/redrover/component/project/status_page/sidebar/OrganizationFolderSidebar.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/OrganizationFolderSidebar.java
similarity index 69%
rename from src/test/java/school/redrover/component/project/status_page/sidebar/OrganizationFolderSidebar.java
rename to src/test/java/school/redrover/ui/component/project/status_page/sidebar/OrganizationFolderSidebar.java
index b70d9fcd3..95ed36564 100644
--- a/src/test/java/school/redrover/component/project/status_page/sidebar/OrganizationFolderSidebar.java
+++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/OrganizationFolderSidebar.java
@@ -1,9 +1,12 @@
-package school.redrover.component.project.status_page.sidebar;
+package school.redrover.ui.component.project.status_page.sidebar;
 
 import org.openqa.selenium.WebDriver;
-import school.redrover.page.*;
-import school.redrover.trait.project_sidebar.SidebarBuildHistoryTrait;
-import school.redrover.trait.project_sidebar.SidebarCredentialsTrait;
+import school.redrover.ui.page.OrganizationFolderBuildHistoryPage;
+import school.redrover.ui.page.OrganizationFolderConfigurationPage;
+import school.redrover.ui.page.OrganizationFolderCredentialsPage;
+import school.redrover.ui.page.OrganizationFolderStatusPage;
+import school.redrover.ui.trait.project_sidebar.SidebarBuildHistoryTrait;
+import school.redrover.ui.trait.project_sidebar.SidebarCredentialsTrait;
 
 
 public class OrganizationFolderSidebar extends BaseSidebarComponent<OrganizationFolderSidebar, OrganizationFolderStatusPage,
diff --git a/src/test/java/school/redrover/component/project/status_page/sidebar/PipelineProjectSidebar.java b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/PipelineProjectSidebar.java
similarity index 63%
rename from src/test/java/school/redrover/component/project/status_page/sidebar/PipelineProjectSidebar.java
rename to src/test/java/school/redrover/ui/component/project/status_page/sidebar/PipelineProjectSidebar.java
index 4ebe81fa6..4df7c999b 100644
--- a/src/test/java/school/redrover/component/project/status_page/sidebar/PipelineProjectSidebar.java
+++ b/src/test/java/school/redrover/ui/component/project/status_page/sidebar/PipelineProjectSidebar.java
@@ -1,15 +1,20 @@
-package school.redrover.component.project.status_page.sidebar;
+package school.redrover.ui.component.project.status_page.sidebar;
 
 import org.openqa.selenium.WebDriver;
-import school.redrover.page.*;
-import school.redrover.trait.project_sidebar.SidebarBuildNowTrait;
-import school.redrover.trait.project_sidebar.SidebarChangesTrait;
-import school.redrover.trait.project_sidebar.SidebarCredentialsTrait;
+import school.redrover.ui.page.PipelineProjectChangesPage;
+import school.redrover.ui.page.PipelineProjectConfigurationPage;
+import school.redrover.ui.page.PipelineProjectCredentialsPage;
+import school.redrover.ui.page.PipelineProjectStatusPage;
+import school.redrover.ui.trait.project_sidebar.SidebarBuildNowTrait;
+import school.redrover.ui.trait.project_sidebar.SidebarChangesTrait;
+import school.redrover.ui.trait.project_sidebar.SidebarCredentialsTrait;
 
 
 public class PipelineProjectSidebar extends BaseSidebarComponent<PipelineProjectSidebar, PipelineProjectStatusPage,
         PipelineProjectConfigurationPage>
-        implements SidebarChangesTrait<PipelineProjectChangesPage>, SidebarBuildNowTrait<PipelineProjectStatusPage>, SidebarCredentialsTrait<PipelineProjectCredentialsPage> {
+        implements SidebarChangesTrait<PipelineProjectChangesPage>,
+        SidebarBuildNowTrait<PipelineProjectStatusPage>,
+        SidebarCredentialsTrait<PipelineProjectCredentialsPage> {
 
     public PipelineProjectSidebar(WebDriver driver) {
         super(driver, PipelineProjectStatusPage::new);
@@ -39,4 +44,5 @@ public PipelineProjectChangesPage getProjectChangesPage() {
     public PipelineProjectCredentialsPage getProjectCredentialsPage() {
         return new PipelineProjectCredentialsPage(getDriver());
     }
+
 }
diff --git a/src/test/java/school/redrover/cucumber/FreestyleSteps.java b/src/test/java/school/redrover/ui/cucumber/FreestyleSteps.java
similarity index 93%
rename from src/test/java/school/redrover/cucumber/FreestyleSteps.java
rename to src/test/java/school/redrover/ui/cucumber/FreestyleSteps.java
index b900429be..6e50fca15 100644
--- a/src/test/java/school/redrover/cucumber/FreestyleSteps.java
+++ b/src/test/java/school/redrover/ui/cucumber/FreestyleSteps.java
@@ -1,14 +1,14 @@
-package school.redrover.cucumber;
+package school.redrover.ui.cucumber;
 
 
 import io.cucumber.java.en.And;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
 import org.testng.Assert;
-import school.redrover.page.NewItemPage;
-import school.redrover.page.FreestyleProjectConfigurationPage;
-import school.redrover.page.FreestyleProjectStatusPage;
-import school.redrover.page.HomePage;
+import school.redrover.ui.page.NewItemPage;
+import school.redrover.ui.page.FreestyleProjectConfigurationPage;
+import school.redrover.ui.page.FreestyleProjectStatusPage;
+import school.redrover.ui.page.HomePage;
 import school.redrover.common.CucumberDriver;
 import school.redrover.common.ProjectUtils;
 
diff --git a/src/test/java/school/redrover/cucumber/ViewSteps.java b/src/test/java/school/redrover/ui/cucumber/ViewSteps.java
similarity index 98%
rename from src/test/java/school/redrover/cucumber/ViewSteps.java
rename to src/test/java/school/redrover/ui/cucumber/ViewSteps.java
index bee7936c4..1280f45a2 100644
--- a/src/test/java/school/redrover/cucumber/ViewSteps.java
+++ b/src/test/java/school/redrover/ui/cucumber/ViewSteps.java
@@ -1,10 +1,10 @@
-package school.redrover.cucumber;
+package school.redrover.ui.cucumber;
 
 import io.cucumber.java.en.And;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
 import org.testng.Assert;
-import school.redrover.page.*;
+import school.redrover.ui.page.*;
 import school.redrover.common.CucumberDriver;
 import school.redrover.common.ProjectUtils;
 
diff --git a/src/test/java/school/redrover/page/AppearancePage.java b/src/test/java/school/redrover/ui/page/AppearancePage.java
similarity index 98%
rename from src/test/java/school/redrover/page/AppearancePage.java
rename to src/test/java/school/redrover/ui/page/AppearancePage.java
index d53d58b5f..3ca23f6a5 100644
--- a/src/test/java/school/redrover/page/AppearancePage.java
+++ b/src/test/java/school/redrover/ui/page/AppearancePage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/school/redrover/page/ArchitectingForScalePage.java b/src/test/java/school/redrover/ui/page/ArchitectingForScalePage.java
similarity index 90%
rename from src/test/java/school/redrover/page/ArchitectingForScalePage.java
rename to src/test/java/school/redrover/ui/page/ArchitectingForScalePage.java
index d84cd07d1..8083a3a78 100644
--- a/src/test/java/school/redrover/page/ArchitectingForScalePage.java
+++ b/src/test/java/school/redrover/ui/page/ArchitectingForScalePage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import school.redrover.common.BasePage;
diff --git a/src/test/java/school/redrover/page/BaseProjectConfigurationPage.java b/src/test/java/school/redrover/ui/page/BaseProjectConfigurationPage.java
similarity index 97%
rename from src/test/java/school/redrover/page/BaseProjectConfigurationPage.java
rename to src/test/java/school/redrover/ui/page/BaseProjectConfigurationPage.java
index fdb1ff323..eade3b46e 100644
--- a/src/test/java/school/redrover/page/BaseProjectConfigurationPage.java
+++ b/src/test/java/school/redrover/ui/page/BaseProjectConfigurationPage.java
@@ -1,6 +1,5 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
-import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
diff --git a/src/test/java/school/redrover/page/BaseProjectStatusPage.java b/src/test/java/school/redrover/ui/page/BaseProjectStatusPage.java
similarity index 79%
rename from src/test/java/school/redrover/page/BaseProjectStatusPage.java
rename to src/test/java/school/redrover/ui/page/BaseProjectStatusPage.java
index 712efcd2a..cdd66d0b2 100644
--- a/src/test/java/school/redrover/page/BaseProjectStatusPage.java
+++ b/src/test/java/school/redrover/ui/page/BaseProjectStatusPage.java
@@ -1,8 +1,8 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import school.redrover.common.BasePage;
-import school.redrover.component.project.status_page.sidebar.BaseSidebarComponent;
+import school.redrover.ui.component.project.status_page.sidebar.BaseSidebarComponent;
 
 
 public abstract class BaseProjectStatusPage<
diff --git a/src/test/java/school/redrover/page/BuildHistoryOfJenkinsPage.java b/src/test/java/school/redrover/ui/page/BuildHistoryOfJenkinsPage.java
similarity index 94%
rename from src/test/java/school/redrover/page/BuildHistoryOfJenkinsPage.java
rename to src/test/java/school/redrover/ui/page/BuildHistoryOfJenkinsPage.java
index af08b55c3..fed2dcfec 100644
--- a/src/test/java/school/redrover/page/BuildHistoryOfJenkinsPage.java
+++ b/src/test/java/school/redrover/ui/page/BuildHistoryOfJenkinsPage.java
@@ -1,10 +1,9 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.ui.ExpectedConditions;
 import school.redrover.common.BasePage;
 
 import java.util.List;
diff --git a/src/test/java/school/redrover/page/CloudsPage.java b/src/test/java/school/redrover/ui/page/CloudsPage.java
similarity index 86%
rename from src/test/java/school/redrover/page/CloudsPage.java
rename to src/test/java/school/redrover/ui/page/CloudsPage.java
index 522418934..f76a86188 100644
--- a/src/test/java/school/redrover/page/CloudsPage.java
+++ b/src/test/java/school/redrover/ui/page/CloudsPage.java
@@ -1,9 +1,8 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.ui.ExpectedConditions;
 import school.redrover.common.BasePage;
 
 
diff --git a/src/test/java/school/redrover/page/CreateViewPage.java b/src/test/java/school/redrover/ui/page/CreateViewPage.java
similarity index 97%
rename from src/test/java/school/redrover/page/CreateViewPage.java
rename to src/test/java/school/redrover/ui/page/CreateViewPage.java
index 92f2c7baa..cea498809 100644
--- a/src/test/java/school/redrover/page/CreateViewPage.java
+++ b/src/test/java/school/redrover/ui/page/CreateViewPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/school/redrover/page/EditViewPage.java b/src/test/java/school/redrover/ui/page/EditViewPage.java
similarity index 98%
rename from src/test/java/school/redrover/page/EditViewPage.java
rename to src/test/java/school/redrover/ui/page/EditViewPage.java
index 771036b41..de87f78dc 100644
--- a/src/test/java/school/redrover/page/EditViewPage.java
+++ b/src/test/java/school/redrover/ui/page/EditViewPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.JavascriptExecutor;
diff --git a/src/test/java/school/redrover/page/ErrorPage.java b/src/test/java/school/redrover/ui/page/ErrorPage.java
similarity index 94%
rename from src/test/java/school/redrover/page/ErrorPage.java
rename to src/test/java/school/redrover/ui/page/ErrorPage.java
index 764d3f4e8..6de37b4b2 100644
--- a/src/test/java/school/redrover/page/ErrorPage.java
+++ b/src/test/java/school/redrover/ui/page/ErrorPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/school/redrover/page/FolderBuildHistoryPage.java b/src/test/java/school/redrover/ui/page/FolderBuildHistoryPage.java
similarity index 91%
rename from src/test/java/school/redrover/page/FolderBuildHistoryPage.java
rename to src/test/java/school/redrover/ui/page/FolderBuildHistoryPage.java
index bb2b554eb..73d89c622 100644
--- a/src/test/java/school/redrover/page/FolderBuildHistoryPage.java
+++ b/src/test/java/school/redrover/ui/page/FolderBuildHistoryPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import school.redrover.common.BasePage;
diff --git a/src/test/java/school/redrover/page/FolderConfigurationPage.java b/src/test/java/school/redrover/ui/page/FolderConfigurationPage.java
similarity index 99%
rename from src/test/java/school/redrover/page/FolderConfigurationPage.java
rename to src/test/java/school/redrover/ui/page/FolderConfigurationPage.java
index 63d99eedd..4bf3eac6a 100644
--- a/src/test/java/school/redrover/page/FolderConfigurationPage.java
+++ b/src/test/java/school/redrover/ui/page/FolderConfigurationPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/school/redrover/page/FolderCreateViewPage.java b/src/test/java/school/redrover/ui/page/FolderCreateViewPage.java
similarity index 97%
rename from src/test/java/school/redrover/page/FolderCreateViewPage.java
rename to src/test/java/school/redrover/ui/page/FolderCreateViewPage.java
index b1bccfb4c..5e39d0332 100644
--- a/src/test/java/school/redrover/page/FolderCreateViewPage.java
+++ b/src/test/java/school/redrover/ui/page/FolderCreateViewPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/school/redrover/page/FolderCredentialsPage.java b/src/test/java/school/redrover/ui/page/FolderCredentialsPage.java
similarity index 92%
rename from src/test/java/school/redrover/page/FolderCredentialsPage.java
rename to src/test/java/school/redrover/ui/page/FolderCredentialsPage.java
index c8829897a..a9fbceffb 100644
--- a/src/test/java/school/redrover/page/FolderCredentialsPage.java
+++ b/src/test/java/school/redrover/ui/page/FolderCredentialsPage.java
@@ -1,11 +1,10 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.interactions.Actions;
 import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.ui.ExpectedConditions;
 import school.redrover.common.BasePage;
 
 
diff --git a/src/test/java/school/redrover/page/FolderStatusPage.java b/src/test/java/school/redrover/ui/page/FolderStatusPage.java
similarity index 98%
rename from src/test/java/school/redrover/page/FolderStatusPage.java
rename to src/test/java/school/redrover/ui/page/FolderStatusPage.java
index 8a785d881..e166e89a6 100644
--- a/src/test/java/school/redrover/page/FolderStatusPage.java
+++ b/src/test/java/school/redrover/ui/page/FolderStatusPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
@@ -7,7 +7,7 @@
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.ui.ExpectedConditions;
 import school.redrover.common.PageUtils;
-import school.redrover.component.project.status_page.sidebar.FolderSidebar;
+import school.redrover.ui.component.project.status_page.sidebar.FolderSidebar;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/test/java/school/redrover/page/FolderViewPage.java b/src/test/java/school/redrover/ui/page/FolderViewPage.java
similarity index 90%
rename from src/test/java/school/redrover/page/FolderViewPage.java
rename to src/test/java/school/redrover/ui/page/FolderViewPage.java
index 78e722dfd..11d5189b7 100644
--- a/src/test/java/school/redrover/page/FolderViewPage.java
+++ b/src/test/java/school/redrover/ui/page/FolderViewPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import school.redrover.common.BasePage;
diff --git a/src/test/java/school/redrover/page/FreestyleProjectChangesPage.java b/src/test/java/school/redrover/ui/page/FreestyleProjectChangesPage.java
similarity index 91%
rename from src/test/java/school/redrover/page/FreestyleProjectChangesPage.java
rename to src/test/java/school/redrover/ui/page/FreestyleProjectChangesPage.java
index 4693437be..da45e69c5 100644
--- a/src/test/java/school/redrover/page/FreestyleProjectChangesPage.java
+++ b/src/test/java/school/redrover/ui/page/FreestyleProjectChangesPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import school.redrover.common.BasePage;
diff --git a/src/test/java/school/redrover/page/FreestyleProjectConfigurationPage.java b/src/test/java/school/redrover/ui/page/FreestyleProjectConfigurationPage.java
similarity index 99%
rename from src/test/java/school/redrover/page/FreestyleProjectConfigurationPage.java
rename to src/test/java/school/redrover/ui/page/FreestyleProjectConfigurationPage.java
index 848899c63..6177cb4eb 100644
--- a/src/test/java/school/redrover/page/FreestyleProjectConfigurationPage.java
+++ b/src/test/java/school/redrover/ui/page/FreestyleProjectConfigurationPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.JavascriptExecutor;
diff --git a/src/test/java/school/redrover/page/FreestyleProjectCredentialsPage.java b/src/test/java/school/redrover/ui/page/FreestyleProjectCredentialsPage.java
similarity index 91%
rename from src/test/java/school/redrover/page/FreestyleProjectCredentialsPage.java
rename to src/test/java/school/redrover/ui/page/FreestyleProjectCredentialsPage.java
index a8b502b32..3fb4d87e0 100644
--- a/src/test/java/school/redrover/page/FreestyleProjectCredentialsPage.java
+++ b/src/test/java/school/redrover/ui/page/FreestyleProjectCredentialsPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import school.redrover.common.BasePage;
diff --git a/src/test/java/school/redrover/page/FreestyleProjectStatusPage.java b/src/test/java/school/redrover/ui/page/FreestyleProjectStatusPage.java
similarity index 91%
rename from src/test/java/school/redrover/page/FreestyleProjectStatusPage.java
rename to src/test/java/school/redrover/ui/page/FreestyleProjectStatusPage.java
index c0ebc1e71..cd87f483d 100644
--- a/src/test/java/school/redrover/page/FreestyleProjectStatusPage.java
+++ b/src/test/java/school/redrover/ui/page/FreestyleProjectStatusPage.java
@@ -1,11 +1,10 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.ui.ExpectedConditions;
-import school.redrover.component.project.status_page.sidebar.FreestyleProjectSidebar;
-import school.redrover.trait.project_sidebar.*;
+import school.redrover.ui.component.project.status_page.sidebar.FreestyleProjectSidebar;
 
 
 public class FreestyleProjectStatusPage extends BaseProjectStatusPage<FreestyleProjectStatusPage, FreestyleProjectSidebar> {
diff --git a/src/test/java/school/redrover/page/FreestyleProjectWorkspacePage.java b/src/test/java/school/redrover/ui/page/FreestyleProjectWorkspacePage.java
similarity index 86%
rename from src/test/java/school/redrover/page/FreestyleProjectWorkspacePage.java
rename to src/test/java/school/redrover/ui/page/FreestyleProjectWorkspacePage.java
index 7a2c7ee18..abdd8a9b2 100644
--- a/src/test/java/school/redrover/page/FreestyleProjectWorkspacePage.java
+++ b/src/test/java/school/redrover/ui/page/FreestyleProjectWorkspacePage.java
@@ -1,9 +1,8 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.ui.ExpectedConditions;
 import school.redrover.common.BasePage;
 
 
diff --git a/src/test/java/school/redrover/page/GlobalCredentialsPage.java b/src/test/java/school/redrover/ui/page/GlobalCredentialsPage.java
similarity index 94%
rename from src/test/java/school/redrover/page/GlobalCredentialsPage.java
rename to src/test/java/school/redrover/ui/page/GlobalCredentialsPage.java
index 6d5237289..c82a47319 100644
--- a/src/test/java/school/redrover/page/GlobalCredentialsPage.java
+++ b/src/test/java/school/redrover/ui/page/GlobalCredentialsPage.java
@@ -1,10 +1,9 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.ui.ExpectedConditions;
 import school.redrover.common.BasePage;
 
 import java.util.List;
diff --git a/src/test/java/school/redrover/page/HomePage.java b/src/test/java/school/redrover/ui/page/HomePage.java
similarity index 99%
rename from src/test/java/school/redrover/page/HomePage.java
rename to src/test/java/school/redrover/ui/page/HomePage.java
index bbccc32b0..625e82921 100644
--- a/src/test/java/school/redrover/page/HomePage.java
+++ b/src/test/java/school/redrover/ui/page/HomePage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
diff --git a/src/test/java/school/redrover/page/JenkinsManagementPage.java b/src/test/java/school/redrover/ui/page/JenkinsManagementPage.java
similarity index 98%
rename from src/test/java/school/redrover/page/JenkinsManagementPage.java
rename to src/test/java/school/redrover/ui/page/JenkinsManagementPage.java
index 8c38ec5af..6f04272d8 100644
--- a/src/test/java/school/redrover/page/JenkinsManagementPage.java
+++ b/src/test/java/school/redrover/ui/page/JenkinsManagementPage.java
@@ -1,6 +1,5 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
-import org.openqa.selenium.By;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/school/redrover/page/LoginPage.java b/src/test/java/school/redrover/ui/page/LoginPage.java
similarity index 92%
rename from src/test/java/school/redrover/page/LoginPage.java
rename to src/test/java/school/redrover/ui/page/LoginPage.java
index 8802da7a0..591173f34 100644
--- a/src/test/java/school/redrover/page/LoginPage.java
+++ b/src/test/java/school/redrover/ui/page/LoginPage.java
@@ -1,9 +1,8 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.ui.ExpectedConditions;
 import school.redrover.common.BasePage;
 
 
diff --git a/src/test/java/school/redrover/page/MultiBranchProjectBuildHistoryPage.java b/src/test/java/school/redrover/ui/page/MultiBranchProjectBuildHistoryPage.java
similarity index 92%
rename from src/test/java/school/redrover/page/MultiBranchProjectBuildHistoryPage.java
rename to src/test/java/school/redrover/ui/page/MultiBranchProjectBuildHistoryPage.java
index e41913f35..3e451bbac 100644
--- a/src/test/java/school/redrover/page/MultiBranchProjectBuildHistoryPage.java
+++ b/src/test/java/school/redrover/ui/page/MultiBranchProjectBuildHistoryPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import school.redrover.common.BasePage;
diff --git a/src/test/java/school/redrover/page/MultiBranchProjectCredentialsPage.java b/src/test/java/school/redrover/ui/page/MultiBranchProjectCredentialsPage.java
similarity index 91%
rename from src/test/java/school/redrover/page/MultiBranchProjectCredentialsPage.java
rename to src/test/java/school/redrover/ui/page/MultiBranchProjectCredentialsPage.java
index 01c513adc..c96752cb3 100644
--- a/src/test/java/school/redrover/page/MultiBranchProjectCredentialsPage.java
+++ b/src/test/java/school/redrover/ui/page/MultiBranchProjectCredentialsPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import school.redrover.common.BasePage;
diff --git a/src/test/java/school/redrover/page/MultiConfigProjectBuildNowPage.java b/src/test/java/school/redrover/ui/page/MultiConfigProjectBuildNowPage.java
similarity index 91%
rename from src/test/java/school/redrover/page/MultiConfigProjectBuildNowPage.java
rename to src/test/java/school/redrover/ui/page/MultiConfigProjectBuildNowPage.java
index 21877a47c..244d8fc27 100644
--- a/src/test/java/school/redrover/page/MultiConfigProjectBuildNowPage.java
+++ b/src/test/java/school/redrover/ui/page/MultiConfigProjectBuildNowPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import school.redrover.common.BasePage;
diff --git a/src/test/java/school/redrover/page/MultiConfigProjectChangesPage.java b/src/test/java/school/redrover/ui/page/MultiConfigProjectChangesPage.java
similarity index 91%
rename from src/test/java/school/redrover/page/MultiConfigProjectChangesPage.java
rename to src/test/java/school/redrover/ui/page/MultiConfigProjectChangesPage.java
index f6f8a1c4f..ccb1da9f0 100644
--- a/src/test/java/school/redrover/page/MultiConfigProjectChangesPage.java
+++ b/src/test/java/school/redrover/ui/page/MultiConfigProjectChangesPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import school.redrover.common.BasePage;
diff --git a/src/test/java/school/redrover/page/MultiConfigProjectConfigurationPage.java b/src/test/java/school/redrover/ui/page/MultiConfigProjectConfigurationPage.java
similarity index 98%
rename from src/test/java/school/redrover/page/MultiConfigProjectConfigurationPage.java
rename to src/test/java/school/redrover/ui/page/MultiConfigProjectConfigurationPage.java
index 2628a736b..f89952c3a 100644
--- a/src/test/java/school/redrover/page/MultiConfigProjectConfigurationPage.java
+++ b/src/test/java/school/redrover/ui/page/MultiConfigProjectConfigurationPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/school/redrover/page/MultiConfigProjectCredentialsPage.java b/src/test/java/school/redrover/ui/page/MultiConfigProjectCredentialsPage.java
similarity index 91%
rename from src/test/java/school/redrover/page/MultiConfigProjectCredentialsPage.java
rename to src/test/java/school/redrover/ui/page/MultiConfigProjectCredentialsPage.java
index 7759b4703..31f40d1ff 100644
--- a/src/test/java/school/redrover/page/MultiConfigProjectCredentialsPage.java
+++ b/src/test/java/school/redrover/ui/page/MultiConfigProjectCredentialsPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import school.redrover.common.BasePage;
diff --git a/src/test/java/school/redrover/page/MultiConfigProjectStatusPage.java b/src/test/java/school/redrover/ui/page/MultiConfigProjectStatusPage.java
similarity index 94%
rename from src/test/java/school/redrover/page/MultiConfigProjectStatusPage.java
rename to src/test/java/school/redrover/ui/page/MultiConfigProjectStatusPage.java
index cc13dbafa..09166d97c 100644
--- a/src/test/java/school/redrover/page/MultiConfigProjectStatusPage.java
+++ b/src/test/java/school/redrover/ui/page/MultiConfigProjectStatusPage.java
@@ -1,9 +1,9 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import school.redrover.component.project.status_page.sidebar.MultiConfigProjectSidebar;
+import school.redrover.ui.component.project.status_page.sidebar.MultiConfigProjectSidebar;
 
 
 public class MultiConfigProjectStatusPage extends BaseProjectStatusPage<MultiConfigProjectStatusPage, MultiConfigProjectSidebar> {
diff --git a/src/test/java/school/redrover/page/MultiConfigProjectWorkspacePage.java b/src/test/java/school/redrover/ui/page/MultiConfigProjectWorkspacePage.java
similarity index 91%
rename from src/test/java/school/redrover/page/MultiConfigProjectWorkspacePage.java
rename to src/test/java/school/redrover/ui/page/MultiConfigProjectWorkspacePage.java
index 73862b626..aa8ef5647 100644
--- a/src/test/java/school/redrover/page/MultiConfigProjectWorkspacePage.java
+++ b/src/test/java/school/redrover/ui/page/MultiConfigProjectWorkspacePage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import school.redrover.common.BasePage;
diff --git a/src/test/java/school/redrover/page/MultibranchProjectConfigurationPage.java b/src/test/java/school/redrover/ui/page/MultibranchProjectConfigurationPage.java
similarity index 98%
rename from src/test/java/school/redrover/page/MultibranchProjectConfigurationPage.java
rename to src/test/java/school/redrover/ui/page/MultibranchProjectConfigurationPage.java
index 2e7857b73..963cffc08 100644
--- a/src/test/java/school/redrover/page/MultibranchProjectConfigurationPage.java
+++ b/src/test/java/school/redrover/ui/page/MultibranchProjectConfigurationPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/school/redrover/page/MultibranchProjectStatusPage.java b/src/test/java/school/redrover/ui/page/MultibranchProjectStatusPage.java
similarity index 94%
rename from src/test/java/school/redrover/page/MultibranchProjectStatusPage.java
rename to src/test/java/school/redrover/ui/page/MultibranchProjectStatusPage.java
index fd2421325..d9c44413a 100644
--- a/src/test/java/school/redrover/page/MultibranchProjectStatusPage.java
+++ b/src/test/java/school/redrover/ui/page/MultibranchProjectStatusPage.java
@@ -1,11 +1,11 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.ui.ExpectedConditions;
-import school.redrover.component.project.status_page.sidebar.MultiBranchProjectSidebar;
+import school.redrover.ui.component.project.status_page.sidebar.MultiBranchProjectSidebar;
 
 
 public class MultibranchProjectStatusPage extends BaseProjectStatusPage<MultibranchProjectStatusPage, MultiBranchProjectSidebar> {
diff --git a/src/test/java/school/redrover/page/NewCredentialsPage.java b/src/test/java/school/redrover/ui/page/NewCredentialsPage.java
similarity index 97%
rename from src/test/java/school/redrover/page/NewCredentialsPage.java
rename to src/test/java/school/redrover/ui/page/NewCredentialsPage.java
index 991f017dd..5607ffee4 100644
--- a/src/test/java/school/redrover/page/NewCredentialsPage.java
+++ b/src/test/java/school/redrover/ui/page/NewCredentialsPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/school/redrover/page/NewItemPage.java b/src/test/java/school/redrover/ui/page/NewItemPage.java
similarity index 99%
rename from src/test/java/school/redrover/page/NewItemPage.java
rename to src/test/java/school/redrover/ui/page/NewItemPage.java
index 3303d6c62..21ac01f25 100644
--- a/src/test/java/school/redrover/page/NewItemPage.java
+++ b/src/test/java/school/redrover/ui/page/NewItemPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/school/redrover/page/NewNodePage.java b/src/test/java/school/redrover/ui/page/NewNodePage.java
similarity index 97%
rename from src/test/java/school/redrover/page/NewNodePage.java
rename to src/test/java/school/redrover/ui/page/NewNodePage.java
index 1bf142ae0..06248a0fb 100644
--- a/src/test/java/school/redrover/page/NewNodePage.java
+++ b/src/test/java/school/redrover/ui/page/NewNodePage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/school/redrover/page/NodesPage.java b/src/test/java/school/redrover/ui/page/NodesPage.java
similarity index 99%
rename from src/test/java/school/redrover/page/NodesPage.java
rename to src/test/java/school/redrover/ui/page/NodesPage.java
index 4d09ccbe1..d5671649f 100644
--- a/src/test/java/school/redrover/page/NodesPage.java
+++ b/src/test/java/school/redrover/ui/page/NodesPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
diff --git a/src/test/java/school/redrover/page/OrganizationFolderBuildHistoryPage.java b/src/test/java/school/redrover/ui/page/OrganizationFolderBuildHistoryPage.java
similarity index 92%
rename from src/test/java/school/redrover/page/OrganizationFolderBuildHistoryPage.java
rename to src/test/java/school/redrover/ui/page/OrganizationFolderBuildHistoryPage.java
index f9a8ff30d..fd85b7376 100644
--- a/src/test/java/school/redrover/page/OrganizationFolderBuildHistoryPage.java
+++ b/src/test/java/school/redrover/ui/page/OrganizationFolderBuildHistoryPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import school.redrover.common.BasePage;
diff --git a/src/test/java/school/redrover/page/OrganizationFolderConfigurationPage.java b/src/test/java/school/redrover/ui/page/OrganizationFolderConfigurationPage.java
similarity index 98%
rename from src/test/java/school/redrover/page/OrganizationFolderConfigurationPage.java
rename to src/test/java/school/redrover/ui/page/OrganizationFolderConfigurationPage.java
index 1eac3f72d..415031c56 100644
--- a/src/test/java/school/redrover/page/OrganizationFolderConfigurationPage.java
+++ b/src/test/java/school/redrover/ui/page/OrganizationFolderConfigurationPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/school/redrover/page/OrganizationFolderCredentialsPage.java b/src/test/java/school/redrover/ui/page/OrganizationFolderCredentialsPage.java
similarity index 91%
rename from src/test/java/school/redrover/page/OrganizationFolderCredentialsPage.java
rename to src/test/java/school/redrover/ui/page/OrganizationFolderCredentialsPage.java
index dd754957a..4a19afa01 100644
--- a/src/test/java/school/redrover/page/OrganizationFolderCredentialsPage.java
+++ b/src/test/java/school/redrover/ui/page/OrganizationFolderCredentialsPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import school.redrover.common.BasePage;
diff --git a/src/test/java/school/redrover/page/OrganizationFolderStatusPage.java b/src/test/java/school/redrover/ui/page/OrganizationFolderStatusPage.java
similarity index 91%
rename from src/test/java/school/redrover/page/OrganizationFolderStatusPage.java
rename to src/test/java/school/redrover/ui/page/OrganizationFolderStatusPage.java
index 0568aabd8..5171688f6 100644
--- a/src/test/java/school/redrover/page/OrganizationFolderStatusPage.java
+++ b/src/test/java/school/redrover/ui/page/OrganizationFolderStatusPage.java
@@ -1,9 +1,9 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import school.redrover.component.project.status_page.sidebar.OrganizationFolderSidebar;
+import school.redrover.ui.component.project.status_page.sidebar.OrganizationFolderSidebar;
 
 
 public class OrganizationFolderStatusPage extends BaseProjectStatusPage<OrganizationFolderStatusPage, OrganizationFolderSidebar> {
diff --git a/src/test/java/school/redrover/page/PipelineProjectBuildNowPage.java b/src/test/java/school/redrover/ui/page/PipelineProjectBuildNowPage.java
similarity index 91%
rename from src/test/java/school/redrover/page/PipelineProjectBuildNowPage.java
rename to src/test/java/school/redrover/ui/page/PipelineProjectBuildNowPage.java
index 4421f0f91..3558810e7 100644
--- a/src/test/java/school/redrover/page/PipelineProjectBuildNowPage.java
+++ b/src/test/java/school/redrover/ui/page/PipelineProjectBuildNowPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import school.redrover.common.BasePage;
diff --git a/src/test/java/school/redrover/page/PipelineProjectChangesPage.java b/src/test/java/school/redrover/ui/page/PipelineProjectChangesPage.java
similarity index 91%
rename from src/test/java/school/redrover/page/PipelineProjectChangesPage.java
rename to src/test/java/school/redrover/ui/page/PipelineProjectChangesPage.java
index 6898a25e3..f1ee47bda 100644
--- a/src/test/java/school/redrover/page/PipelineProjectChangesPage.java
+++ b/src/test/java/school/redrover/ui/page/PipelineProjectChangesPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import school.redrover.common.BasePage;
diff --git a/src/test/java/school/redrover/page/PipelineProjectConfigurationPage.java b/src/test/java/school/redrover/ui/page/PipelineProjectConfigurationPage.java
similarity index 99%
rename from src/test/java/school/redrover/page/PipelineProjectConfigurationPage.java
rename to src/test/java/school/redrover/ui/page/PipelineProjectConfigurationPage.java
index b2b8f47b9..b8c9682e5 100644
--- a/src/test/java/school/redrover/page/PipelineProjectConfigurationPage.java
+++ b/src/test/java/school/redrover/ui/page/PipelineProjectConfigurationPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;
diff --git a/src/test/java/school/redrover/page/PipelineProjectCredentialsPage.java b/src/test/java/school/redrover/ui/page/PipelineProjectCredentialsPage.java
similarity index 91%
rename from src/test/java/school/redrover/page/PipelineProjectCredentialsPage.java
rename to src/test/java/school/redrover/ui/page/PipelineProjectCredentialsPage.java
index f83ca2415..01081f58f 100644
--- a/src/test/java/school/redrover/page/PipelineProjectCredentialsPage.java
+++ b/src/test/java/school/redrover/ui/page/PipelineProjectCredentialsPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import school.redrover.common.BasePage;
diff --git a/src/test/java/school/redrover/page/PipelineProjectHistoryConsolePage.java b/src/test/java/school/redrover/ui/page/PipelineProjectHistoryConsolePage.java
similarity index 94%
rename from src/test/java/school/redrover/page/PipelineProjectHistoryConsolePage.java
rename to src/test/java/school/redrover/ui/page/PipelineProjectHistoryConsolePage.java
index ad2becde6..62d86707a 100644
--- a/src/test/java/school/redrover/page/PipelineProjectHistoryConsolePage.java
+++ b/src/test/java/school/redrover/ui/page/PipelineProjectHistoryConsolePage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/school/redrover/page/PipelineProjectHistoryPage.java b/src/test/java/school/redrover/ui/page/PipelineProjectHistoryPage.java
similarity index 95%
rename from src/test/java/school/redrover/page/PipelineProjectHistoryPage.java
rename to src/test/java/school/redrover/ui/page/PipelineProjectHistoryPage.java
index a29627aa5..d76a063b2 100644
--- a/src/test/java/school/redrover/page/PipelineProjectHistoryPage.java
+++ b/src/test/java/school/redrover/ui/page/PipelineProjectHistoryPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/school/redrover/page/PipelineProjectStatusPage.java b/src/test/java/school/redrover/ui/page/PipelineProjectStatusPage.java
similarity index 96%
rename from src/test/java/school/redrover/page/PipelineProjectStatusPage.java
rename to src/test/java/school/redrover/ui/page/PipelineProjectStatusPage.java
index beb066dc4..372e9712a 100644
--- a/src/test/java/school/redrover/page/PipelineProjectStatusPage.java
+++ b/src/test/java/school/redrover/ui/page/PipelineProjectStatusPage.java
@@ -1,11 +1,11 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import org.openqa.selenium.support.ui.ExpectedConditions;
-import school.redrover.component.project.status_page.sidebar.PipelineProjectSidebar;
+import school.redrover.ui.component.project.status_page.sidebar.PipelineProjectSidebar;
 
 import java.util.List;
 
diff --git a/src/test/java/school/redrover/page/PipelineProjectSyntaxPage.java b/src/test/java/school/redrover/ui/page/PipelineProjectSyntaxPage.java
similarity index 95%
rename from src/test/java/school/redrover/page/PipelineProjectSyntaxPage.java
rename to src/test/java/school/redrover/ui/page/PipelineProjectSyntaxPage.java
index aebbcd5a3..9f0661357 100644
--- a/src/test/java/school/redrover/page/PipelineProjectSyntaxPage.java
+++ b/src/test/java/school/redrover/ui/page/PipelineProjectSyntaxPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/school/redrover/page/ProjectMovePage.java b/src/test/java/school/redrover/ui/page/ProjectMovePage.java
similarity index 97%
rename from src/test/java/school/redrover/page/ProjectMovePage.java
rename to src/test/java/school/redrover/ui/page/ProjectMovePage.java
index 87c772293..129386246 100644
--- a/src/test/java/school/redrover/page/ProjectMovePage.java
+++ b/src/test/java/school/redrover/ui/page/ProjectMovePage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/school/redrover/page/ProjectRenamingPage.java b/src/test/java/school/redrover/ui/page/ProjectRenamingPage.java
similarity index 97%
rename from src/test/java/school/redrover/page/ProjectRenamingPage.java
rename to src/test/java/school/redrover/ui/page/ProjectRenamingPage.java
index 6ad4d041a..20e2c4cd0 100644
--- a/src/test/java/school/redrover/page/ProjectRenamingPage.java
+++ b/src/test/java/school/redrover/ui/page/ProjectRenamingPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/school/redrover/page/RestApiPage.java b/src/test/java/school/redrover/ui/page/RestApiPage.java
similarity index 95%
rename from src/test/java/school/redrover/page/RestApiPage.java
rename to src/test/java/school/redrover/ui/page/RestApiPage.java
index 63199be1e..b36e32a06 100644
--- a/src/test/java/school/redrover/page/RestApiPage.java
+++ b/src/test/java/school/redrover/ui/page/RestApiPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
diff --git a/src/test/java/school/redrover/page/SystemConfigurationPage.java b/src/test/java/school/redrover/ui/page/SystemConfigurationPage.java
similarity index 99%
rename from src/test/java/school/redrover/page/SystemConfigurationPage.java
rename to src/test/java/school/redrover/ui/page/SystemConfigurationPage.java
index 920b6a3d5..b8ea475b0 100644
--- a/src/test/java/school/redrover/page/SystemConfigurationPage.java
+++ b/src/test/java/school/redrover/ui/page/SystemConfigurationPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.*;
 import org.openqa.selenium.interactions.Actions;
diff --git a/src/test/java/school/redrover/page/UserAccountPage.java b/src/test/java/school/redrover/ui/page/UserAccountPage.java
similarity index 94%
rename from src/test/java/school/redrover/page/UserAccountPage.java
rename to src/test/java/school/redrover/ui/page/UserAccountPage.java
index effdfba07..9f6cef95e 100644
--- a/src/test/java/school/redrover/page/UserAccountPage.java
+++ b/src/test/java/school/redrover/ui/page/UserAccountPage.java
@@ -1,9 +1,8 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.ui.ExpectedConditions;
 import school.redrover.common.BasePage;
 
 
diff --git a/src/test/java/school/redrover/page/UserCreatingPage.java b/src/test/java/school/redrover/ui/page/UserCreatingPage.java
similarity index 95%
rename from src/test/java/school/redrover/page/UserCreatingPage.java
rename to src/test/java/school/redrover/ui/page/UserCreatingPage.java
index ed3fb964e..8f682f74c 100644
--- a/src/test/java/school/redrover/page/UserCreatingPage.java
+++ b/src/test/java/school/redrover/ui/page/UserCreatingPage.java
@@ -1,9 +1,8 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.ui.ExpectedConditions;
 import school.redrover.common.BasePage;
 
 import java.util.List;
diff --git a/src/test/java/school/redrover/page/UserStatusPage.java b/src/test/java/school/redrover/ui/page/UserStatusPage.java
similarity index 98%
rename from src/test/java/school/redrover/page/UserStatusPage.java
rename to src/test/java/school/redrover/ui/page/UserStatusPage.java
index ece5b1893..13b506b23 100644
--- a/src/test/java/school/redrover/page/UserStatusPage.java
+++ b/src/test/java/school/redrover/ui/page/UserStatusPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
diff --git a/src/test/java/school/redrover/page/UsersPage.java b/src/test/java/school/redrover/ui/page/UsersPage.java
similarity index 98%
rename from src/test/java/school/redrover/page/UsersPage.java
rename to src/test/java/school/redrover/ui/page/UsersPage.java
index 9229e97a3..e78bad3fa 100644
--- a/src/test/java/school/redrover/page/UsersPage.java
+++ b/src/test/java/school/redrover/ui/page/UsersPage.java
@@ -1,4 +1,4 @@
-package school.redrover.page;
+package school.redrover.ui.page;
 
 import org.openqa.selenium.By;
 import org.openqa.selenium.Keys;
diff --git a/src/test/java/school/redrover/trait/BaseTrait.java b/src/test/java/school/redrover/ui/trait/BaseTrait.java
similarity index 87%
rename from src/test/java/school/redrover/trait/BaseTrait.java
rename to src/test/java/school/redrover/ui/trait/BaseTrait.java
index 5b7728168..5d9eae4c6 100644
--- a/src/test/java/school/redrover/trait/BaseTrait.java
+++ b/src/test/java/school/redrover/ui/trait/BaseTrait.java
@@ -1,4 +1,4 @@
-package school.redrover.trait;
+package school.redrover.ui.trait;
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.ui.WebDriverWait;
diff --git a/src/test/java/school/redrover/trait/project_sidebar/SidebarBuildHistoryTrait.java b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarBuildHistoryTrait.java
similarity index 84%
rename from src/test/java/school/redrover/trait/project_sidebar/SidebarBuildHistoryTrait.java
rename to src/test/java/school/redrover/ui/trait/project_sidebar/SidebarBuildHistoryTrait.java
index 38fc9a88c..18336ec30 100644
--- a/src/test/java/school/redrover/trait/project_sidebar/SidebarBuildHistoryTrait.java
+++ b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarBuildHistoryTrait.java
@@ -1,9 +1,9 @@
-package school.redrover.trait.project_sidebar;
+package school.redrover.ui.trait.project_sidebar;
 
 import org.openqa.selenium.By;
 
 import school.redrover.common.BasePage;
-import school.redrover.trait.BaseTrait;
+import school.redrover.ui.trait.BaseTrait;
 
 
 public interface SidebarBuildHistoryTrait<ProjectBuildHistoryPage extends BasePage<ProjectBuildHistoryPage>>
diff --git a/src/test/java/school/redrover/trait/project_sidebar/SidebarBuildNowTrait.java b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarBuildNowTrait.java
similarity index 82%
rename from src/test/java/school/redrover/trait/project_sidebar/SidebarBuildNowTrait.java
rename to src/test/java/school/redrover/ui/trait/project_sidebar/SidebarBuildNowTrait.java
index 821da19f3..209d76fea 100644
--- a/src/test/java/school/redrover/trait/project_sidebar/SidebarBuildNowTrait.java
+++ b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarBuildNowTrait.java
@@ -1,9 +1,9 @@
-package school.redrover.trait.project_sidebar;
+package school.redrover.ui.trait.project_sidebar;
 
 import org.openqa.selenium.By;
 
 import school.redrover.common.BasePage;
-import school.redrover.trait.BaseTrait;
+import school.redrover.ui.trait.BaseTrait;
 
 
 public interface SidebarBuildNowTrait<ProjectStatusPage extends BasePage<ProjectStatusPage>>
diff --git a/src/test/java/school/redrover/trait/project_sidebar/SidebarChangesTrait.java b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarChangesTrait.java
similarity index 82%
rename from src/test/java/school/redrover/trait/project_sidebar/SidebarChangesTrait.java
rename to src/test/java/school/redrover/ui/trait/project_sidebar/SidebarChangesTrait.java
index c62dbcc3f..28e2e1a43 100644
--- a/src/test/java/school/redrover/trait/project_sidebar/SidebarChangesTrait.java
+++ b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarChangesTrait.java
@@ -1,9 +1,9 @@
-package school.redrover.trait.project_sidebar;
+package school.redrover.ui.trait.project_sidebar;
 
 import org.openqa.selenium.By;
 
 import school.redrover.common.BasePage;
-import school.redrover.trait.BaseTrait;
+import school.redrover.ui.trait.BaseTrait;
 
 
 public interface SidebarChangesTrait<ProjectChangesPage extends BasePage<ProjectChangesPage>> extends BaseTrait {
diff --git a/src/test/java/school/redrover/trait/project_sidebar/SidebarCredentialsTrait.java b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarCredentialsTrait.java
similarity index 83%
rename from src/test/java/school/redrover/trait/project_sidebar/SidebarCredentialsTrait.java
rename to src/test/java/school/redrover/ui/trait/project_sidebar/SidebarCredentialsTrait.java
index ee35cf470..56f899018 100644
--- a/src/test/java/school/redrover/trait/project_sidebar/SidebarCredentialsTrait.java
+++ b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarCredentialsTrait.java
@@ -1,9 +1,9 @@
-package school.redrover.trait.project_sidebar;
+package school.redrover.ui.trait.project_sidebar;
 
 import org.openqa.selenium.By;
 
 import school.redrover.common.BasePage;
-import school.redrover.trait.BaseTrait;
+import school.redrover.ui.trait.BaseTrait;
 
 
 public interface SidebarCredentialsTrait<ProjectCredentialsPage extends BasePage<ProjectCredentialsPage>> extends BaseTrait {
diff --git a/src/test/java/school/redrover/trait/project_sidebar/SidebarWorkspaceTrait.java b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarWorkspaceTrait.java
similarity index 83%
rename from src/test/java/school/redrover/trait/project_sidebar/SidebarWorkspaceTrait.java
rename to src/test/java/school/redrover/ui/trait/project_sidebar/SidebarWorkspaceTrait.java
index 81d303ace..dbcf0698b 100644
--- a/src/test/java/school/redrover/trait/project_sidebar/SidebarWorkspaceTrait.java
+++ b/src/test/java/school/redrover/ui/trait/project_sidebar/SidebarWorkspaceTrait.java
@@ -1,9 +1,9 @@
-package school.redrover.trait.project_sidebar;
+package school.redrover.ui.trait.project_sidebar;
 
 import org.openqa.selenium.By;
 
 import school.redrover.common.BasePage;
-import school.redrover.trait.BaseTrait;
+import school.redrover.ui.trait.BaseTrait;
 
 
 public interface SidebarWorkspaceTrait<ProjectWorkspacePage extends BasePage<ProjectWorkspacePage>> extends BaseTrait {