diff --git a/spring-petclinic-it/README.md b/spring-petclinic-tests/README.md
similarity index 100%
rename from spring-petclinic-it/README.md
rename to spring-petclinic-tests/README.md
diff --git a/spring-petclinic-it/pom.xml b/spring-petclinic-tests/pom.xml
similarity index 98%
rename from spring-petclinic-it/pom.xml
rename to spring-petclinic-tests/pom.xml
index 39fa9a5ac..2a64424b7 100644
--- a/spring-petclinic-it/pom.xml
+++ b/spring-petclinic-tests/pom.xml
@@ -4,8 +4,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>pet_clinic_test_example</groupId>
-    <artifactId>pet_clinic_test_example</artifactId>
+    <groupId>com.griddynamics.asf.webapp-demo</groupId>
+    <artifactId>spring-peclinic-tests</artifactId>
     <version>1.0-SNAPSHOT</version>
 
     <properties>
@@ -110,7 +110,6 @@
     </dependencies>
 
 
-
     <profiles>
         <profile>
             <id>excludeTesting</id>
@@ -241,6 +240,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.8</version>
                 <executions>
                     <execution>
                         <id>unpack-resources-core</id>
@@ -280,6 +280,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>properties-maven-plugin</artifactId>
+                <version>1.0-alpha-2</version>
                 <executions>
                     <execution>
                         <id>read</id>
diff --git a/spring-petclinic-it/src/main/java/com/griddynamics/web/PetClinicStoreHost.java b/spring-petclinic-tests/src/main/java/com/griddynamics/web/PetClinicStoreHost.java
similarity index 100%
rename from spring-petclinic-it/src/main/java/com/griddynamics/web/PetClinicStoreHost.java
rename to spring-petclinic-tests/src/main/java/com/griddynamics/web/PetClinicStoreHost.java
diff --git a/spring-petclinic-it/src/main/java/com/griddynamics/web/blocks/HeaderBlock.java b/spring-petclinic-tests/src/main/java/com/griddynamics/web/blocks/HeaderBlock.java
similarity index 100%
rename from spring-petclinic-it/src/main/java/com/griddynamics/web/blocks/HeaderBlock.java
rename to spring-petclinic-tests/src/main/java/com/griddynamics/web/blocks/HeaderBlock.java
diff --git a/spring-petclinic-it/src/main/java/com/griddynamics/web/blocks/HeaderBlockData.java b/spring-petclinic-tests/src/main/java/com/griddynamics/web/blocks/HeaderBlockData.java
similarity index 100%
rename from spring-petclinic-it/src/main/java/com/griddynamics/web/blocks/HeaderBlockData.java
rename to spring-petclinic-tests/src/main/java/com/griddynamics/web/blocks/HeaderBlockData.java
diff --git a/spring-petclinic-it/src/main/java/com/griddynamics/web/pages/CustomPages.java b/spring-petclinic-tests/src/main/java/com/griddynamics/web/pages/CustomPages.java
similarity index 100%
rename from spring-petclinic-it/src/main/java/com/griddynamics/web/pages/CustomPages.java
rename to spring-petclinic-tests/src/main/java/com/griddynamics/web/pages/CustomPages.java
diff --git a/spring-petclinic-it/src/main/java/com/griddynamics/web/pages/PetClinicCommonPage.java b/spring-petclinic-tests/src/main/java/com/griddynamics/web/pages/PetClinicCommonPage.java
similarity index 100%
rename from spring-petclinic-it/src/main/java/com/griddynamics/web/pages/PetClinicCommonPage.java
rename to spring-petclinic-tests/src/main/java/com/griddynamics/web/pages/PetClinicCommonPage.java
diff --git a/spring-petclinic-it/src/main/java/com/griddynamics/web/pages/PetClinicFindOwnersPage.java b/spring-petclinic-tests/src/main/java/com/griddynamics/web/pages/PetClinicFindOwnersPage.java
similarity index 100%
rename from spring-petclinic-it/src/main/java/com/griddynamics/web/pages/PetClinicFindOwnersPage.java
rename to spring-petclinic-tests/src/main/java/com/griddynamics/web/pages/PetClinicFindOwnersPage.java
diff --git a/spring-petclinic-it/src/main/java/com/griddynamics/web/pages/PetClinicHomePage.java b/spring-petclinic-tests/src/main/java/com/griddynamics/web/pages/PetClinicHomePage.java
similarity index 100%
rename from spring-petclinic-it/src/main/java/com/griddynamics/web/pages/PetClinicHomePage.java
rename to spring-petclinic-tests/src/main/java/com/griddynamics/web/pages/PetClinicHomePage.java
diff --git a/spring-petclinic-it/src/main/java/com/griddynamics/web/suits/UITestsExampleSuite.java b/spring-petclinic-tests/src/main/java/com/griddynamics/web/suits/UITestsExampleSuite.java
similarity index 100%
rename from spring-petclinic-it/src/main/java/com/griddynamics/web/suits/UITestsExampleSuite.java
rename to spring-petclinic-tests/src/main/java/com/griddynamics/web/suits/UITestsExampleSuite.java
diff --git a/spring-petclinic-it/src/main/java/com/griddynamics/webservices/steps/WebServicesSteps.java b/spring-petclinic-tests/src/main/java/com/griddynamics/webservices/steps/WebServicesSteps.java
similarity index 100%
rename from spring-petclinic-it/src/main/java/com/griddynamics/webservices/steps/WebServicesSteps.java
rename to spring-petclinic-tests/src/main/java/com/griddynamics/webservices/steps/WebServicesSteps.java
diff --git a/spring-petclinic-it/src/main/java/com/griddynamics/webservices/suits/WebServicesExampleSuite.java b/spring-petclinic-tests/src/main/java/com/griddynamics/webservices/suits/WebServicesExampleSuite.java
similarity index 100%
rename from spring-petclinic-it/src/main/java/com/griddynamics/webservices/suits/WebServicesExampleSuite.java
rename to spring-petclinic-tests/src/main/java/com/griddynamics/webservices/suits/WebServicesExampleSuite.java
diff --git a/spring-petclinic-it/src/main/resources/browser.properties b/spring-petclinic-tests/src/main/resources/browser.properties
similarity index 100%
rename from spring-petclinic-it/src/main/resources/browser.properties
rename to spring-petclinic-tests/src/main/resources/browser.properties
diff --git a/spring-petclinic-it/src/main/resources/com/griddynamics/context/pagesBeans.xml b/spring-petclinic-tests/src/main/resources/com/griddynamics/context/pagesBeans.xml
similarity index 100%
rename from spring-petclinic-it/src/main/resources/com/griddynamics/context/pagesBeans.xml
rename to spring-petclinic-tests/src/main/resources/com/griddynamics/context/pagesBeans.xml
diff --git a/spring-petclinic-it/src/main/resources/com/griddynamics/context/uiPropertiesContext.xml b/spring-petclinic-tests/src/main/resources/com/griddynamics/context/uiPropertiesContext.xml
similarity index 100%
rename from spring-petclinic-it/src/main/resources/com/griddynamics/context/uiPropertiesContext.xml
rename to spring-petclinic-tests/src/main/resources/com/griddynamics/context/uiPropertiesContext.xml
diff --git a/spring-petclinic-it/src/main/resources/com/griddynamics/context/webApplicationContext.xml b/spring-petclinic-tests/src/main/resources/com/griddynamics/context/webApplicationContext.xml
similarity index 100%
rename from spring-petclinic-it/src/main/resources/com/griddynamics/context/webApplicationContext.xml
rename to spring-petclinic-tests/src/main/resources/com/griddynamics/context/webApplicationContext.xml
diff --git a/spring-petclinic-it/src/main/resources/com/griddynamics/context/webServicesApplicationContext.xml b/spring-petclinic-tests/src/main/resources/com/griddynamics/context/webServicesApplicationContext.xml
similarity index 100%
rename from spring-petclinic-it/src/main/resources/com/griddynamics/context/webServicesApplicationContext.xml
rename to spring-petclinic-tests/src/main/resources/com/griddynamics/context/webServicesApplicationContext.xml
diff --git a/spring-petclinic-it/src/main/resources/com/griddynamics/stories/uitests/CheckHomePage.story b/spring-petclinic-tests/src/main/resources/com/griddynamics/stories/uitests/CheckHomePage.story
similarity index 100%
rename from spring-petclinic-it/src/main/resources/com/griddynamics/stories/uitests/CheckHomePage.story
rename to spring-petclinic-tests/src/main/resources/com/griddynamics/stories/uitests/CheckHomePage.story
diff --git a/spring-petclinic-it/src/main/resources/com/griddynamics/stories/uitests/FindOwner.story b/spring-petclinic-tests/src/main/resources/com/griddynamics/stories/uitests/FindOwner.story
similarity index 100%
rename from spring-petclinic-it/src/main/resources/com/griddynamics/stories/uitests/FindOwner.story
rename to spring-petclinic-tests/src/main/resources/com/griddynamics/stories/uitests/FindOwner.story
diff --git a/spring-petclinic-it/src/main/resources/com/griddynamics/stories/webservice/CheckVetWebServiceResponseBody.story b/spring-petclinic-tests/src/main/resources/com/griddynamics/stories/webservice/CheckVetWebServiceResponseBody.story
similarity index 100%
rename from spring-petclinic-it/src/main/resources/com/griddynamics/stories/webservice/CheckVetWebServiceResponseBody.story
rename to spring-petclinic-tests/src/main/resources/com/griddynamics/stories/webservice/CheckVetWebServiceResponseBody.story
diff --git a/spring-petclinic-it/src/main/resources/com/griddynamics/stories/webservice/CheckVetWebServiceResponseCode.story b/spring-petclinic-tests/src/main/resources/com/griddynamics/stories/webservice/CheckVetWebServiceResponseCode.story
similarity index 100%
rename from spring-petclinic-it/src/main/resources/com/griddynamics/stories/webservice/CheckVetWebServiceResponseCode.story
rename to spring-petclinic-tests/src/main/resources/com/griddynamics/stories/webservice/CheckVetWebServiceResponseCode.story
diff --git a/spring-petclinic-it/src/main/resources/jbehave.properties b/spring-petclinic-tests/src/main/resources/jbehave.properties
similarity index 100%
rename from spring-petclinic-it/src/main/resources/jbehave.properties
rename to spring-petclinic-tests/src/main/resources/jbehave.properties
diff --git a/spring-petclinic-it/src/main/resources/log4j.properties b/spring-petclinic-tests/src/main/resources/log4j.properties
similarity index 100%
rename from spring-petclinic-it/src/main/resources/log4j.properties
rename to spring-petclinic-tests/src/main/resources/log4j.properties
diff --git a/spring-petclinic-it/src/main/resources/pages.properties b/spring-petclinic-tests/src/main/resources/pages.properties
similarity index 100%
rename from spring-petclinic-it/src/main/resources/pages.properties
rename to spring-petclinic-tests/src/main/resources/pages.properties
diff --git a/spring-petclinic-it/src/main/resources/store.properties b/spring-petclinic-tests/src/main/resources/store.properties
similarity index 100%
rename from spring-petclinic-it/src/main/resources/store.properties
rename to spring-petclinic-tests/src/main/resources/store.properties