diff --git a/src/main/config/checkstyle-suppressions.xml b/src/main/config/checkstyle-suppressions.xml
index f72ee89e73..528e7925aa 100644
--- a/src/main/config/checkstyle-suppressions.xml
+++ b/src/main/config/checkstyle-suppressions.xml
@@ -6,7 +6,7 @@
 <suppressions>
 	
 	<!-- false positives due to Lombok usage -->
-	<suppress checks="HideUtilityClassConstructor" files="ru.mystamps.web.model" />
+	<suppress checks="HideUtilityClassConstructor" files="ru.mystamps.web.controller.dto" />
 	
 	<!-- I don't want to rename WebDriverFactory to AbstractWebDriverFactory -->
 	<suppress checks="AbstractClassName" files="ru.mystamps.web.tests.WebDriverFactory" />
diff --git a/src/main/config/findbugs-filter.xml b/src/main/config/findbugs-filter.xml
index 230bee5f5e..c938e71341 100644
--- a/src/main/config/findbugs-filter.xml
+++ b/src/main/config/findbugs-filter.xml
@@ -8,15 +8,6 @@
 		<Class name="~.*\.dto\..*" />
 		<Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2" />
 	</Match>
-	<Match>
-		<!--
-			Our DTO classes expose it's internal representation.
-			Most of the time because they're using Date class and
-			storing data in byte[].
-		-->
-		<Class name="~.*\.model\..*" />
-		<Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2" />
-	</Match>
 	<Match>
 		<!--
 			It's ok, that we're don't override parent's equals() method.
diff --git a/src/main/java/ru/mystamps/web/controller/AccountController.java b/src/main/java/ru/mystamps/web/controller/AccountController.java
index 4fbc4eb941..86557d27f4 100644
--- a/src/main/java/ru/mystamps/web/controller/AccountController.java
+++ b/src/main/java/ru/mystamps/web/controller/AccountController.java
@@ -41,14 +41,14 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.Url;
-import ru.mystamps.web.model.ActivateAccountForm;
-import ru.mystamps.web.model.ActivateAccountForm.ActKeyChecks;
-import ru.mystamps.web.model.ActivateAccountForm.FormChecks;
-import ru.mystamps.web.model.ActivateAccountForm.LoginChecks;
-import ru.mystamps.web.model.ActivateAccountForm.NameChecks;
-import ru.mystamps.web.model.ActivateAccountForm.PasswordChecks;
-import ru.mystamps.web.model.ActivateAccountForm.PasswordConfirmationChecks;
-import ru.mystamps.web.model.RegisterAccountForm;
+import ru.mystamps.web.controller.dto.ActivateAccountForm;
+import ru.mystamps.web.controller.dto.ActivateAccountForm.ActKeyChecks;
+import ru.mystamps.web.controller.dto.ActivateAccountForm.FormChecks;
+import ru.mystamps.web.controller.dto.ActivateAccountForm.LoginChecks;
+import ru.mystamps.web.controller.dto.ActivateAccountForm.NameChecks;
+import ru.mystamps.web.controller.dto.ActivateAccountForm.PasswordChecks;
+import ru.mystamps.web.controller.dto.ActivateAccountForm.PasswordConfirmationChecks;
+import ru.mystamps.web.controller.dto.RegisterAccountForm;
 import ru.mystamps.web.service.UserService;
 import ru.mystamps.web.service.UsersActivationService;
 
diff --git a/src/main/java/ru/mystamps/web/controller/CategoryController.java b/src/main/java/ru/mystamps/web/controller/CategoryController.java
index a9daaa545f..6f657f839b 100644
--- a/src/main/java/ru/mystamps/web/controller/CategoryController.java
+++ b/src/main/java/ru/mystamps/web/controller/CategoryController.java
@@ -42,10 +42,10 @@
 import ru.mystamps.web.Url;
 import ru.mystamps.web.controller.converter.annotation.Category;
 import ru.mystamps.web.controller.converter.annotation.CurrentUser;
+import ru.mystamps.web.controller.dto.AddCategoryForm;
 import ru.mystamps.web.controller.editor.ReplaceRepeatingSpacesEditor;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.dao.dto.SeriesInfoDto;
-import ru.mystamps.web.model.AddCategoryForm;
 import ru.mystamps.web.service.CategoryService;
 import ru.mystamps.web.service.SeriesService;
 import ru.mystamps.web.util.LocaleUtils;
diff --git a/src/main/java/ru/mystamps/web/controller/CountryController.java b/src/main/java/ru/mystamps/web/controller/CountryController.java
index 8349e25207..b8e82b5f8a 100644
--- a/src/main/java/ru/mystamps/web/controller/CountryController.java
+++ b/src/main/java/ru/mystamps/web/controller/CountryController.java
@@ -42,10 +42,10 @@
 import ru.mystamps.web.Url;
 import ru.mystamps.web.controller.converter.annotation.Country;
 import ru.mystamps.web.controller.converter.annotation.CurrentUser;
+import ru.mystamps.web.controller.dto.AddCountryForm;
 import ru.mystamps.web.controller.editor.ReplaceRepeatingSpacesEditor;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.dao.dto.SeriesInfoDto;
-import ru.mystamps.web.model.AddCountryForm;
 import ru.mystamps.web.service.CountryService;
 import ru.mystamps.web.service.SeriesService;
 import ru.mystamps.web.util.LocaleUtils;
diff --git a/src/main/java/ru/mystamps/web/controller/ParticipantController.java b/src/main/java/ru/mystamps/web/controller/ParticipantController.java
index 39b279993d..16d8230376 100644
--- a/src/main/java/ru/mystamps/web/controller/ParticipantController.java
+++ b/src/main/java/ru/mystamps/web/controller/ParticipantController.java
@@ -30,7 +30,7 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.Url;
-import ru.mystamps.web.model.AddParticipantForm;
+import ru.mystamps.web.controller.dto.AddParticipantForm;
 import ru.mystamps.web.service.TransactionParticipantService;
 
 import static ru.mystamps.web.controller.ControllerUtils.redirectTo;
diff --git a/src/main/java/ru/mystamps/web/controller/SeriesController.java b/src/main/java/ru/mystamps/web/controller/SeriesController.java
index 6bd133b5a4..38d8855842 100644
--- a/src/main/java/ru/mystamps/web/controller/SeriesController.java
+++ b/src/main/java/ru/mystamps/web/controller/SeriesController.java
@@ -59,13 +59,13 @@
 import ru.mystamps.web.controller.converter.annotation.Category;
 import ru.mystamps.web.controller.converter.annotation.Country;
 import ru.mystamps.web.controller.converter.annotation.CurrentUser;
+import ru.mystamps.web.controller.dto.AddImageForm;
+import ru.mystamps.web.controller.dto.AddSeriesForm;
+import ru.mystamps.web.controller.dto.AddSeriesSalesForm;
 import ru.mystamps.web.dao.dto.EntityWithIdDto;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.dao.dto.PurchaseAndSaleDto;
 import ru.mystamps.web.dao.dto.SeriesInfoDto;
-import ru.mystamps.web.model.AddImageForm;
-import ru.mystamps.web.model.AddSeriesForm;
-import ru.mystamps.web.model.AddSeriesSalesForm;
 import ru.mystamps.web.service.CategoryService;
 import ru.mystamps.web.service.CollectionService;
 import ru.mystamps.web.service.CountryService;
diff --git a/src/main/java/ru/mystamps/web/model/ActivateAccountForm.java b/src/main/java/ru/mystamps/web/controller/dto/ActivateAccountForm.java
similarity index 94%
rename from src/main/java/ru/mystamps/web/model/ActivateAccountForm.java
rename to src/main/java/ru/mystamps/web/controller/dto/ActivateAccountForm.java
index aeb8ec046a..850af35640 100644
--- a/src/main/java/ru/mystamps/web/model/ActivateAccountForm.java
+++ b/src/main/java/ru/mystamps/web/controller/dto/ActivateAccountForm.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.model;
+package ru.mystamps.web.controller.dto;
 
 import javax.validation.GroupSequence;
 import javax.validation.constraints.Pattern;
@@ -27,11 +27,12 @@
 import lombok.Setter;
 
 import ru.mystamps.web.service.dto.ActivateAccountDto;
+import ru.mystamps.web.support.beanvalidation.ExistingActivationKey;
+import ru.mystamps.web.support.beanvalidation.FieldsMatch;
+import ru.mystamps.web.support.beanvalidation.FieldsMismatch;
+import ru.mystamps.web.support.beanvalidation.UniqueLogin;
 import ru.mystamps.web.validation.ValidationRules;
-import ru.mystamps.web.validation.jsr303.ExistingActivationKey;
-import ru.mystamps.web.validation.jsr303.FieldsMatch;
-import ru.mystamps.web.validation.jsr303.FieldsMismatch;
-import ru.mystamps.web.validation.jsr303.UniqueLogin;
+
 
 @Getter
 @Setter
diff --git a/src/main/java/ru/mystamps/web/model/AddCategoryForm.java b/src/main/java/ru/mystamps/web/controller/dto/AddCategoryForm.java
similarity index 92%
rename from src/main/java/ru/mystamps/web/model/AddCategoryForm.java
rename to src/main/java/ru/mystamps/web/controller/dto/AddCategoryForm.java
index 333dae4add..50e63e15b6 100644
--- a/src/main/java/ru/mystamps/web/model/AddCategoryForm.java
+++ b/src/main/java/ru/mystamps/web/controller/dto/AddCategoryForm.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.model;
+package ru.mystamps.web.controller.dto;
 
 import javax.validation.GroupSequence;
 import javax.validation.constraints.Pattern;
@@ -27,10 +27,10 @@
 import lombok.Setter;
 
 import ru.mystamps.web.service.dto.AddCategoryDto;
-import ru.mystamps.web.validation.jsr303.DenyValues;
-import ru.mystamps.web.validation.jsr303.UniqueCategoryName;
-import ru.mystamps.web.validation.jsr303.UniqueCategoryName.Lang;
-import ru.mystamps.web.validation.jsr303.UniqueCategorySlug;
+import ru.mystamps.web.support.beanvalidation.DenyValues;
+import ru.mystamps.web.support.beanvalidation.UniqueCategoryName;
+import ru.mystamps.web.support.beanvalidation.UniqueCategoryName.Lang;
+import ru.mystamps.web.support.beanvalidation.UniqueCategorySlug;
 
 import static ru.mystamps.web.validation.ValidationRules.CATEGORY_NAME_EN_REGEXP;
 import static ru.mystamps.web.validation.ValidationRules.CATEGORY_NAME_MAX_LENGTH;
diff --git a/src/main/java/ru/mystamps/web/model/AddCountryForm.java b/src/main/java/ru/mystamps/web/controller/dto/AddCountryForm.java
similarity index 92%
rename from src/main/java/ru/mystamps/web/model/AddCountryForm.java
rename to src/main/java/ru/mystamps/web/controller/dto/AddCountryForm.java
index a21c6df06a..420783d8b9 100644
--- a/src/main/java/ru/mystamps/web/model/AddCountryForm.java
+++ b/src/main/java/ru/mystamps/web/controller/dto/AddCountryForm.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.model;
+package ru.mystamps.web.controller.dto;
 
 import javax.validation.GroupSequence;
 import javax.validation.constraints.Pattern;
@@ -27,10 +27,10 @@
 import lombok.Setter;
 
 import ru.mystamps.web.service.dto.AddCountryDto;
-import ru.mystamps.web.validation.jsr303.DenyValues;
-import ru.mystamps.web.validation.jsr303.UniqueCountryName;
-import ru.mystamps.web.validation.jsr303.UniqueCountryName.Lang;
-import ru.mystamps.web.validation.jsr303.UniqueCountrySlug;
+import ru.mystamps.web.support.beanvalidation.DenyValues;
+import ru.mystamps.web.support.beanvalidation.UniqueCountryName;
+import ru.mystamps.web.support.beanvalidation.UniqueCountryName.Lang;
+import ru.mystamps.web.support.beanvalidation.UniqueCountrySlug;
 
 import static ru.mystamps.web.validation.ValidationRules.COUNTRY_NAME_EN_REGEXP;
 import static ru.mystamps.web.validation.ValidationRules.COUNTRY_NAME_MAX_LENGTH;
diff --git a/src/main/java/ru/mystamps/web/model/AddImageForm.java b/src/main/java/ru/mystamps/web/controller/dto/AddImageForm.java
similarity index 82%
rename from src/main/java/ru/mystamps/web/model/AddImageForm.java
rename to src/main/java/ru/mystamps/web/controller/dto/AddImageForm.java
index 8b498a629a..2f19f097df 100644
--- a/src/main/java/ru/mystamps/web/model/AddImageForm.java
+++ b/src/main/java/ru/mystamps/web/controller/dto/AddImageForm.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.model;
+package ru.mystamps.web.controller.dto;
 
 import javax.validation.GroupSequence;
 import javax.validation.constraints.NotNull;
@@ -26,11 +26,11 @@
 import lombok.Setter;
 
 import ru.mystamps.web.service.dto.AddImageDto;
-import ru.mystamps.web.validation.jsr303.ImageFile;
-import ru.mystamps.web.validation.jsr303.MaxFileSize;
-import ru.mystamps.web.validation.jsr303.MaxFileSize.Unit;
-import ru.mystamps.web.validation.jsr303.NotEmptyFile;
-import ru.mystamps.web.validation.jsr303.NotEmptyFilename;
+import ru.mystamps.web.support.beanvalidation.ImageFile;
+import ru.mystamps.web.support.beanvalidation.MaxFileSize;
+import ru.mystamps.web.support.beanvalidation.MaxFileSize.Unit;
+import ru.mystamps.web.support.beanvalidation.NotEmptyFile;
+import ru.mystamps.web.support.beanvalidation.NotEmptyFilename;
 
 import static ru.mystamps.web.validation.ValidationRules.MAX_IMAGE_SIZE;
 
diff --git a/src/main/java/ru/mystamps/web/model/AddParticipantForm.java b/src/main/java/ru/mystamps/web/controller/dto/AddParticipantForm.java
similarity index 97%
rename from src/main/java/ru/mystamps/web/model/AddParticipantForm.java
rename to src/main/java/ru/mystamps/web/controller/dto/AddParticipantForm.java
index 4d17dfed61..2e5af807ef 100644
--- a/src/main/java/ru/mystamps/web/model/AddParticipantForm.java
+++ b/src/main/java/ru/mystamps/web/controller/dto/AddParticipantForm.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.model;
+package ru.mystamps.web.controller.dto;
 
 import javax.validation.constraints.Size;
 
diff --git a/src/main/java/ru/mystamps/web/model/AddSeriesForm.java b/src/main/java/ru/mystamps/web/controller/dto/AddSeriesForm.java
similarity index 88%
rename from src/main/java/ru/mystamps/web/model/AddSeriesForm.java
rename to src/main/java/ru/mystamps/web/controller/dto/AddSeriesForm.java
index 5533d5cbda..506a71cd2c 100644
--- a/src/main/java/ru/mystamps/web/model/AddSeriesForm.java
+++ b/src/main/java/ru/mystamps/web/controller/dto/AddSeriesForm.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.model;
+package ru.mystamps.web.controller.dto;
 
 import java.math.BigDecimal;
 
@@ -36,15 +36,15 @@
 import ru.mystamps.web.controller.converter.annotation.Country;
 import ru.mystamps.web.dao.dto.LinkEntityDto;
 import ru.mystamps.web.service.dto.AddSeriesDto;
-import ru.mystamps.web.validation.jsr303.CatalogNumbers;
-import ru.mystamps.web.validation.jsr303.ImageFile;
-import ru.mystamps.web.validation.jsr303.MaxFileSize;
-import ru.mystamps.web.validation.jsr303.MaxFileSize.Unit;
-import ru.mystamps.web.validation.jsr303.NotEmptyFile;
-import ru.mystamps.web.validation.jsr303.NotEmptyFilename;
-import ru.mystamps.web.validation.jsr303.NotNullIfFirstField;
-import ru.mystamps.web.validation.jsr303.Price;
-import ru.mystamps.web.validation.jsr303.ReleaseDateIsNotInFuture;
+import ru.mystamps.web.support.beanvalidation.CatalogNumbers;
+import ru.mystamps.web.support.beanvalidation.ImageFile;
+import ru.mystamps.web.support.beanvalidation.MaxFileSize;
+import ru.mystamps.web.support.beanvalidation.MaxFileSize.Unit;
+import ru.mystamps.web.support.beanvalidation.NotEmptyFile;
+import ru.mystamps.web.support.beanvalidation.NotEmptyFilename;
+import ru.mystamps.web.support.beanvalidation.NotNullIfFirstField;
+import ru.mystamps.web.support.beanvalidation.Price;
+import ru.mystamps.web.support.beanvalidation.ReleaseDateIsNotInFuture;
 
 import static ru.mystamps.web.validation.ValidationRules.MAX_DAYS_IN_MONTH;
 import static ru.mystamps.web.validation.ValidationRules.MAX_IMAGE_SIZE;
diff --git a/src/main/java/ru/mystamps/web/model/AddSeriesSalesForm.java b/src/main/java/ru/mystamps/web/controller/dto/AddSeriesSalesForm.java
similarity index 97%
rename from src/main/java/ru/mystamps/web/model/AddSeriesSalesForm.java
rename to src/main/java/ru/mystamps/web/controller/dto/AddSeriesSalesForm.java
index da2bbbb61e..175b967c9b 100644
--- a/src/main/java/ru/mystamps/web/model/AddSeriesSalesForm.java
+++ b/src/main/java/ru/mystamps/web/controller/dto/AddSeriesSalesForm.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.model;
+package ru.mystamps.web.controller.dto;
 
 import java.math.BigDecimal;
 import java.util.Date;
diff --git a/src/main/java/ru/mystamps/web/model/Group.java b/src/main/java/ru/mystamps/web/controller/dto/Group.java
similarity index 96%
rename from src/main/java/ru/mystamps/web/model/Group.java
rename to src/main/java/ru/mystamps/web/controller/dto/Group.java
index 9f7c89d8b7..f51fbe7d94 100644
--- a/src/main/java/ru/mystamps/web/model/Group.java
+++ b/src/main/java/ru/mystamps/web/controller/dto/Group.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.model;
+package ru.mystamps.web.controller.dto;
 
 final class Group {
 	
diff --git a/src/main/java/ru/mystamps/web/model/RegisterAccountForm.java b/src/main/java/ru/mystamps/web/controller/dto/RegisterAccountForm.java
similarity index 94%
rename from src/main/java/ru/mystamps/web/model/RegisterAccountForm.java
rename to src/main/java/ru/mystamps/web/controller/dto/RegisterAccountForm.java
index d018346a57..0b0849cff0 100644
--- a/src/main/java/ru/mystamps/web/model/RegisterAccountForm.java
+++ b/src/main/java/ru/mystamps/web/controller/dto/RegisterAccountForm.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.model;
+package ru.mystamps.web.controller.dto;
 
 import javax.validation.GroupSequence;
 import javax.validation.constraints.Size;
@@ -26,7 +26,7 @@
 import lombok.Setter;
 
 import ru.mystamps.web.service.dto.RegisterAccountDto;
-import ru.mystamps.web.validation.jsr303.Email;
+import ru.mystamps.web.support.beanvalidation.Email;
 
 import static ru.mystamps.web.validation.ValidationRules.EMAIL_MAX_LENGTH;
 
diff --git a/src/main/java/ru/mystamps/web/model/package-info.java b/src/main/java/ru/mystamps/web/controller/dto/package-info.java
similarity index 83%
rename from src/main/java/ru/mystamps/web/model/package-info.java
rename to src/main/java/ru/mystamps/web/controller/dto/package-info.java
index 7b4107e0ff..2ca8b0dafc 100644
--- a/src/main/java/ru/mystamps/web/model/package-info.java
+++ b/src/main/java/ru/mystamps/web/controller/dto/package-info.java
@@ -3,4 +3,4 @@
  * classes that are representing values from site forms and being used by
  * controllers as input values.
  */
-package ru.mystamps.web.model;
+package ru.mystamps.web.controller.dto;
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/CatalogNumbers.java b/src/main/java/ru/mystamps/web/support/beanvalidation/CatalogNumbers.java
similarity index 92%
rename from src/main/java/ru/mystamps/web/validation/jsr303/CatalogNumbers.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/CatalogNumbers.java
index 270bdce598..4bed2ffc50 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/CatalogNumbers.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/CatalogNumbers.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -40,7 +40,7 @@
 @Constraint(validatedBy = {})
 @Documented
 public @interface CatalogNumbers {
-	String message() default "{ru.mystamps.web.validation.jsr303.CatalogNumbers.message}";
+	String message() default "{ru.mystamps.web.support.beanvalidation.CatalogNumbers.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 }
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/ConstraintViolationUtils.java b/src/main/java/ru/mystamps/web/support/beanvalidation/ConstraintViolationUtils.java
similarity index 97%
rename from src/main/java/ru/mystamps/web/validation/jsr303/ConstraintViolationUtils.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/ConstraintViolationUtils.java
index 8a32a8653d..968afbf066 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/ConstraintViolationUtils.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/ConstraintViolationUtils.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import javax.validation.ConstraintValidatorContext;
 
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/DenyValues.java b/src/main/java/ru/mystamps/web/support/beanvalidation/DenyValues.java
similarity index 91%
rename from src/main/java/ru/mystamps/web/validation/jsr303/DenyValues.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/DenyValues.java
index 97a6445c46..e1388646cd 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/DenyValues.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/DenyValues.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -37,7 +37,7 @@
 @Constraint(validatedBy = DenyValuesValidator.class)
 @Documented
 public @interface DenyValues {
-	String message() default "{ru.mystamps.web.validation.jsr303.DenyValues.message}";
+	String message() default "{ru.mystamps.web.support.beanvalidation.DenyValues.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 	String[] value();
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/DenyValuesValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/DenyValuesValidator.java
similarity index 96%
rename from src/main/java/ru/mystamps/web/validation/jsr303/DenyValuesValidator.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/DenyValuesValidator.java
index 6ba33a1367..3f7992e756 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/DenyValuesValidator.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/DenyValuesValidator.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/Email.java b/src/main/java/ru/mystamps/web/support/beanvalidation/Email.java
similarity index 93%
rename from src/main/java/ru/mystamps/web/validation/jsr303/Email.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/Email.java
index d87b6b0be5..6276635c41 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/Email.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/Email.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -49,7 +49,7 @@
 @Constraint(validatedBy = {})
 @Documented
 public @interface Email {
-	String message() default "{ru.mystamps.web.validation.jsr303.Email.message}";
+	String message() default "{ru.mystamps.web.support.beanvalidation.Email.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 }
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/ExistingActivationKey.java b/src/main/java/ru/mystamps/web/support/beanvalidation/ExistingActivationKey.java
similarity index 87%
rename from src/main/java/ru/mystamps/web/validation/jsr303/ExistingActivationKey.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/ExistingActivationKey.java
index b338c79764..7e0a189ba7 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/ExistingActivationKey.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/ExistingActivationKey.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -34,7 +34,8 @@
 @Constraint(validatedBy = ExistingActivationKeyValidator.class)
 @Documented
 public @interface ExistingActivationKey {
-	String message() default "{ru.mystamps.web.validation.jsr303.ExistingActivationKey.message}";
+        // CheckStyle: ignore LineLength for next 1 line
+	String message() default "{ru.mystamps.web.support.beanvalidation.ExistingActivationKey.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 }
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/ExistingActivationKeyValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/ExistingActivationKeyValidator.java
similarity index 96%
rename from src/main/java/ru/mystamps/web/validation/jsr303/ExistingActivationKeyValidator.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/ExistingActivationKeyValidator.java
index 3081b16b95..c6907b4b32 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/ExistingActivationKeyValidator.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/ExistingActivationKeyValidator.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/FieldsMatch.java b/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMatch.java
similarity index 91%
rename from src/main/java/ru/mystamps/web/validation/jsr303/FieldsMatch.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMatch.java
index 299e6c9391..a982b5237d 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/FieldsMatch.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMatch.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -33,7 +33,7 @@
 @Constraint(validatedBy = FieldsMatchValidator.class)
 @Documented
 public @interface FieldsMatch {
-	String message() default "{ru.mystamps.web.validation.jsr303.FieldsMatch.message}";
+	String message() default "{ru.mystamps.web.support.beanvalidation.FieldsMatch.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 	
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/FieldsMatchValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMatchValidator.java
similarity index 97%
rename from src/main/java/ru/mystamps/web/validation/jsr303/FieldsMatchValidator.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMatchValidator.java
index 96f84e5b83..1f3a6603df 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/FieldsMatchValidator.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMatchValidator.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.util.Objects;
 
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/FieldsMismatch.java b/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMismatch.java
similarity index 91%
rename from src/main/java/ru/mystamps/web/validation/jsr303/FieldsMismatch.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMismatch.java
index 0212d258bb..6aa86bdf30 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/FieldsMismatch.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMismatch.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -33,7 +33,7 @@
 @Constraint(validatedBy = FieldsMismatchValidator.class)
 @Documented
 public @interface FieldsMismatch {
-	String message() default "{ru.mystamps.web.validation.jsr303.FieldsMismatch.message}";
+	String message() default "{ru.mystamps.web.support.beanvalidation.FieldsMismatch.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 	
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/FieldsMismatchValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMismatchValidator.java
similarity index 97%
rename from src/main/java/ru/mystamps/web/validation/jsr303/FieldsMismatchValidator.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMismatchValidator.java
index 5308876d92..21d8ce71e6 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/FieldsMismatchValidator.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/FieldsMismatchValidator.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.util.Objects;
 
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/ImageFile.java b/src/main/java/ru/mystamps/web/support/beanvalidation/ImageFile.java
similarity index 91%
rename from src/main/java/ru/mystamps/web/validation/jsr303/ImageFile.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/ImageFile.java
index b943d86595..35e3729279 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/ImageFile.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/ImageFile.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -34,7 +34,7 @@
 @Constraint(validatedBy = ImageFileValidator.class)
 @Documented
 public @interface ImageFile {
-	String message() default "{ru.mystamps.web.validation.jsr303.ImageFile.message}";
+	String message() default "{ru.mystamps.web.support.beanvalidation.ImageFile.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 }
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/ImageFileValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/ImageFileValidator.java
similarity index 98%
rename from src/main/java/ru/mystamps/web/validation/jsr303/ImageFileValidator.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/ImageFileValidator.java
index 741549c12c..e939f2ddd7 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/ImageFileValidator.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/ImageFileValidator.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/MaxFileSize.java b/src/main/java/ru/mystamps/web/support/beanvalidation/MaxFileSize.java
similarity index 92%
rename from src/main/java/ru/mystamps/web/validation/jsr303/MaxFileSize.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/MaxFileSize.java
index 289eae5b76..a45f704823 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/MaxFileSize.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/MaxFileSize.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -40,7 +40,7 @@
 @Constraint(validatedBy = MaxFileSizeValidator.class)
 @Documented
 public @interface MaxFileSize {
-	String message() default "{ru.mystamps.web.validation.jsr303.MaxFileSize.message}";
+	String message() default "{ru.mystamps.web.support.beanvalidation.MaxFileSize.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 	long value();
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/MaxFileSizeValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/MaxFileSizeValidator.java
similarity index 97%
rename from src/main/java/ru/mystamps/web/validation/jsr303/MaxFileSizeValidator.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/MaxFileSizeValidator.java
index 6e96ea3b94..6d05f595f7 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/MaxFileSizeValidator.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/MaxFileSizeValidator.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/NotEmptyFile.java b/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFile.java
similarity index 91%
rename from src/main/java/ru/mystamps/web/validation/jsr303/NotEmptyFile.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFile.java
index 721e7b3ea5..a4f78a4d59 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/NotEmptyFile.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFile.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -34,7 +34,7 @@
 @Constraint(validatedBy = NotEmptyFileValidator.class)
 @Documented
 public @interface NotEmptyFile {
-	String message() default "{ru.mystamps.web.validation.jsr303.NotEmptyFile.message}";
+	String message() default "{ru.mystamps.web.support.beanvalidation.NotEmptyFile.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 }
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/NotEmptyFileValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFileValidator.java
similarity index 96%
rename from src/main/java/ru/mystamps/web/validation/jsr303/NotEmptyFileValidator.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFileValidator.java
index b635f79284..17786ed077 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/NotEmptyFileValidator.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFileValidator.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/NotEmptyFilename.java b/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFilename.java
similarity index 91%
rename from src/main/java/ru/mystamps/web/validation/jsr303/NotEmptyFilename.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFilename.java
index 0340cc8293..e7be82f5ba 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/NotEmptyFilename.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFilename.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -34,7 +34,7 @@
 @Constraint(validatedBy = NotEmptyFilenameValidator.class)
 @Documented
 public @interface NotEmptyFilename {
-	String message() default "{ru.mystamps.web.validation.jsr303.NotEmptyFilename.message}";
+	String message() default "{ru.mystamps.web.support.beanvalidation.NotEmptyFilename.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 }
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/NotEmptyFilenameValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFilenameValidator.java
similarity index 96%
rename from src/main/java/ru/mystamps/web/validation/jsr303/NotEmptyFilenameValidator.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFilenameValidator.java
index 1119104b00..c015217e32 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/NotEmptyFilenameValidator.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/NotEmptyFilenameValidator.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/NotNullIfFirstField.java b/src/main/java/ru/mystamps/web/support/beanvalidation/NotNullIfFirstField.java
similarity index 92%
rename from src/main/java/ru/mystamps/web/validation/jsr303/NotNullIfFirstField.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/NotNullIfFirstField.java
index 67a5e0ac42..acc4f9b344 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/NotNullIfFirstField.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/NotNullIfFirstField.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -33,7 +33,7 @@
 @Constraint(validatedBy = NotNullIfFirstFieldValidator.class)
 @Documented
 public @interface NotNullIfFirstField {
-	String message() default "{ru.mystamps.web.validation.jsr303.NotNullIfFirstField.message}";
+	String message() default "{ru.mystamps.web.support.beanvalidation.NotNullIfFirstField.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 	
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/NotNullIfFirstFieldValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/NotNullIfFirstFieldValidator.java
similarity index 97%
rename from src/main/java/ru/mystamps/web/validation/jsr303/NotNullIfFirstFieldValidator.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/NotNullIfFirstFieldValidator.java
index b81c323401..879835ddd4 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/NotNullIfFirstFieldValidator.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/NotNullIfFirstFieldValidator.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.util.Objects;
 
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/Price.java b/src/main/java/ru/mystamps/web/support/beanvalidation/Price.java
similarity index 92%
rename from src/main/java/ru/mystamps/web/validation/jsr303/Price.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/Price.java
index 9dddda4f2d..fd0dfad57c 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/Price.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/Price.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -38,7 +38,7 @@
 @Constraint(validatedBy = {})
 @Documented
 public @interface Price {
-	String message() default "{ru.mystamps.web.validation.jsr303.Price.message}";
+	String message() default "{ru.mystamps.web.support.beanvalidation.Price.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 }
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/ReleaseDateIsNotInFuture.java b/src/main/java/ru/mystamps/web/support/beanvalidation/ReleaseDateIsNotInFuture.java
similarity index 87%
rename from src/main/java/ru/mystamps/web/validation/jsr303/ReleaseDateIsNotInFuture.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/ReleaseDateIsNotInFuture.java
index 6b0bdda547..9dd98d69bd 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/ReleaseDateIsNotInFuture.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/ReleaseDateIsNotInFuture.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -36,7 +36,8 @@
 @Constraint(validatedBy = ReleaseDateIsNotInFutureValidator.class)
 @Documented
 public @interface ReleaseDateIsNotInFuture {
-	String message() default "{ru.mystamps.web.validation.jsr303.ReleaseDateIsNotInFuture.message}";
+        // CheckStyle: ignore LineLength for next 1 line
+	String message() default "{ru.mystamps.web.support.beanvalidation.ReleaseDateIsNotInFuture.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 }
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/ReleaseDateIsNotInFutureValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/ReleaseDateIsNotInFutureValidator.java
similarity index 98%
rename from src/main/java/ru/mystamps/web/validation/jsr303/ReleaseDateIsNotInFutureValidator.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/ReleaseDateIsNotInFutureValidator.java
index a08e25cc34..22d54a6775 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/ReleaseDateIsNotInFutureValidator.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/ReleaseDateIsNotInFutureValidator.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.time.LocalDate;
 import java.time.Year;
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueCategoryName.java b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCategoryName.java
similarity index 91%
rename from src/main/java/ru/mystamps/web/validation/jsr303/UniqueCategoryName.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCategoryName.java
index 2dfd3351cb..0158bdbe07 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueCategoryName.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCategoryName.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -34,7 +34,7 @@
 @Constraint(validatedBy = UniqueCategoryNameValidator.class)
 @Documented
 public @interface UniqueCategoryName {
-	String message() default "{ru.mystamps.web.validation.jsr303.UniqueCategoryName.message}";
+	String message() default "{ru.mystamps.web.support.beanvalidation.UniqueCategoryName.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 	
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueCategoryNameValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCategoryNameValidator.java
similarity index 93%
rename from src/main/java/ru/mystamps/web/validation/jsr303/UniqueCategoryNameValidator.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCategoryNameValidator.java
index cfe8f0c31a..61f58d2c4c 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueCategoryNameValidator.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCategoryNameValidator.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
@@ -23,7 +23,7 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.service.CategoryService;
-import ru.mystamps.web.validation.jsr303.UniqueCategoryName.Lang;
+import ru.mystamps.web.support.beanvalidation.UniqueCategoryName.Lang;
 
 @RequiredArgsConstructor
 public class UniqueCategoryNameValidator
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueCategorySlug.java b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCategorySlug.java
similarity index 91%
rename from src/main/java/ru/mystamps/web/validation/jsr303/UniqueCategorySlug.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCategorySlug.java
index 90e4c2dd27..ca197c2a14 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueCategorySlug.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCategorySlug.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -34,7 +34,7 @@
 @Constraint(validatedBy = UniqueCategorySlugValidator.class)
 @Documented
 public @interface UniqueCategorySlug {
-	String message() default "{ru.mystamps.web.validation.jsr303.UniqueCategorySlug.message}";
+	String message() default "{ru.mystamps.web.support.beanvalidation.UniqueCategorySlug.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 }
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueCategorySlugValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCategorySlugValidator.java
similarity index 97%
rename from src/main/java/ru/mystamps/web/validation/jsr303/UniqueCategorySlugValidator.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCategorySlugValidator.java
index 78f6fa62ef..bd84ade96d 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueCategorySlugValidator.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCategorySlugValidator.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueCountryName.java b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCountryName.java
similarity index 91%
rename from src/main/java/ru/mystamps/web/validation/jsr303/UniqueCountryName.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCountryName.java
index 0becbaa116..300cb093c2 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueCountryName.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCountryName.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -34,7 +34,7 @@
 @Constraint(validatedBy = UniqueCountryNameValidator.class)
 @Documented
 public @interface UniqueCountryName {
-	String message() default "{ru.mystamps.web.validation.jsr303.UniqueCountryName.message}";
+	String message() default "{ru.mystamps.web.support.beanvalidation.UniqueCountryName.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueCountryNameValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCountryNameValidator.java
similarity index 93%
rename from src/main/java/ru/mystamps/web/validation/jsr303/UniqueCountryNameValidator.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCountryNameValidator.java
index a0c421a486..63f74b1ad0 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueCountryNameValidator.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCountryNameValidator.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
@@ -23,7 +23,7 @@
 import lombok.RequiredArgsConstructor;
 
 import ru.mystamps.web.service.CountryService;
-import ru.mystamps.web.validation.jsr303.UniqueCountryName.Lang;
+import ru.mystamps.web.support.beanvalidation.UniqueCountryName.Lang;
 
 @RequiredArgsConstructor
 public class UniqueCountryNameValidator implements ConstraintValidator<UniqueCountryName, String> {
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueCountrySlug.java b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCountrySlug.java
similarity index 91%
rename from src/main/java/ru/mystamps/web/validation/jsr303/UniqueCountrySlug.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCountrySlug.java
index 58f4e5d709..3702c77871 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueCountrySlug.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCountrySlug.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -34,7 +34,7 @@
 @Constraint(validatedBy = UniqueCountrySlugValidator.class)
 @Documented
 public @interface UniqueCountrySlug {
-	String message() default "{ru.mystamps.web.validation.jsr303.UniqueCountrySlug.message}";
+	String message() default "{ru.mystamps.web.support.beanvalidation.UniqueCountrySlug.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 }
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueCountrySlugValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCountrySlugValidator.java
similarity index 96%
rename from src/main/java/ru/mystamps/web/validation/jsr303/UniqueCountrySlugValidator.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCountrySlugValidator.java
index baf4e7b9ab..704adb0b48 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueCountrySlugValidator.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueCountrySlugValidator.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueLogin.java b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueLogin.java
similarity index 91%
rename from src/main/java/ru/mystamps/web/validation/jsr303/UniqueLogin.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/UniqueLogin.java
index 28a70c56a8..bcc62030aa 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueLogin.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueLogin.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.Retention;
@@ -34,7 +34,7 @@
 @Constraint(validatedBy = UniqueLoginValidator.class)
 @Documented
 public @interface UniqueLogin {
-	String message() default "{ru.mystamps.web.validation.jsr303.UniqueLogin.message}";
+	String message() default "{ru.mystamps.web.support.beanvalidation.UniqueLogin.message}";
 	Class<?>[] groups() default {};
 	Class<? extends Payload>[] payload() default {};
 }
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueLoginValidator.java b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueLoginValidator.java
similarity index 96%
rename from src/main/java/ru/mystamps/web/validation/jsr303/UniqueLoginValidator.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/UniqueLoginValidator.java
index 032b4eb916..83d80d0c2a 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/UniqueLoginValidator.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/UniqueLoginValidator.java
@@ -15,7 +15,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/package-info.java b/src/main/java/ru/mystamps/web/support/beanvalidation/package-info.java
similarity index 74%
rename from src/main/java/ru/mystamps/web/validation/jsr303/package-info.java
rename to src/main/java/ru/mystamps/web/support/beanvalidation/package-info.java
index 8a2e5da22b..6547dd3bc7 100644
--- a/src/main/java/ru/mystamps/web/validation/jsr303/package-info.java
+++ b/src/main/java/ru/mystamps/web/support/beanvalidation/package-info.java
@@ -2,4 +2,4 @@
  * Implementations of the custom <a href="http://beanvalidation.org/1.0/spec/"
  * target="_blank">JSR-303</a> compatible validators.
  */
-package ru.mystamps.web.validation.jsr303;
+package ru.mystamps.web.support.beanvalidation;
diff --git a/src/main/resources/ru/mystamps/i18n/ValidationMessages.properties b/src/main/resources/ru/mystamps/i18n/ValidationMessages.properties
index afb42b83db..9a01d76d90 100644
--- a/src/main/resources/ru/mystamps/i18n/ValidationMessages.properties
+++ b/src/main/resources/ru/mystamps/i18n/ValidationMessages.properties
@@ -5,24 +5,24 @@ javax.validation.constraints.Max.message = Value must be less than or equal to {
 org.hibernate.validator.constraints.NotEmpty.message = Value must not be empty
 org.hibernate.validator.constraints.URL.message = Value must be a valid URL
 
-ru.mystamps.web.validation.jsr303.DenyValues.message = Invalid value
-ru.mystamps.web.validation.jsr303.FieldsMismatch.message = Field '{second}' must mismatch '{first}'
-ru.mystamps.web.validation.jsr303.FieldsMatch.message = Field '{second}' must match '{first}'
-ru.mystamps.web.validation.jsr303.UniqueLogin.message = Login already exists
-ru.mystamps.web.validation.jsr303.UniqueCountryName.message = Country already exists
-ru.mystamps.web.validation.jsr303.UniqueCategoryName.message = Category already exists
-ru.mystamps.web.validation.jsr303.UniqueCountrySlug.message = Country with similar name already exists
-ru.mystamps.web.validation.jsr303.UniqueCategorySlug.message = Category with similar name already exists
-ru.mystamps.web.validation.jsr303.ExistingActivationKey.message = Wrong activation key
-ru.mystamps.web.validation.jsr303.Email.message = Wrong e-mail address
-ru.mystamps.web.validation.jsr303.NotEmptyFilename.message = Value must not be empty
-ru.mystamps.web.validation.jsr303.NotEmptyFile.message = File must not be empty
-ru.mystamps.web.validation.jsr303.CatalogNumbers.message = Value must be comma delimited numbers
-ru.mystamps.web.validation.jsr303.ReleaseDateIsNotInFuture.message = Release date must not be in future
-ru.mystamps.web.validation.jsr303.NotNullIfFirstField.message = Field '{second}' must not be empty
-ru.mystamps.web.validation.jsr303.Price.message = Invalid value
-ru.mystamps.web.validation.jsr303.ImageFile.message = Cannot detect file type. Must be image in JPEG or PNG format
-ru.mystamps.web.validation.jsr303.MaxFileSize.message = File size must be not greater than {value} ${unit.name()}
+ru.mystamps.web.support.beanvalidation.DenyValues.message = Invalid value
+ru.mystamps.web.support.beanvalidation.FieldsMismatch.message = Field '{second}' must mismatch '{first}'
+ru.mystamps.web.support.beanvalidation.FieldsMatch.message = Field '{second}' must match '{first}'
+ru.mystamps.web.support.beanvalidation.UniqueLogin.message = Login already exists
+ru.mystamps.web.support.beanvalidation.UniqueCountryName.message = Country already exists
+ru.mystamps.web.support.beanvalidation.UniqueCategoryName.message = Category already exists
+ru.mystamps.web.support.beanvalidation.UniqueCountrySlug.message = Country with similar name already exists
+ru.mystamps.web.support.beanvalidation.UniqueCategorySlug.message = Category with similar name already exists
+ru.mystamps.web.support.beanvalidation.ExistingActivationKey.message = Wrong activation key
+ru.mystamps.web.support.beanvalidation.Email.message = Wrong e-mail address
+ru.mystamps.web.support.beanvalidation.NotEmptyFilename.message = Value must not be empty
+ru.mystamps.web.support.beanvalidation.NotEmptyFile.message = File must not be empty
+ru.mystamps.web.support.beanvalidation.CatalogNumbers.message = Value must be comma delimited numbers
+ru.mystamps.web.support.beanvalidation.ReleaseDateIsNotInFuture.message = Release date must not be in future
+ru.mystamps.web.support.beanvalidation.NotNullIfFirstField.message = Field '{second}' must not be empty
+ru.mystamps.web.support.beanvalidation.Price.message = Invalid value
+ru.mystamps.web.support.beanvalidation.ImageFile.message = Cannot detect file type. Must be image in JPEG or PNG format
+ru.mystamps.web.support.beanvalidation.MaxFileSize.message = File size must be not greater than {value} ${unit.name()}
 
 value.too-short = Value is less than allowable minimum of {min} characters
 value.too-long = Value is greater than allowable maximum of {max} characters
diff --git a/src/main/resources/ru/mystamps/i18n/ValidationMessages_ru.properties b/src/main/resources/ru/mystamps/i18n/ValidationMessages_ru.properties
index 415a805c2b..41d96b00e4 100644
--- a/src/main/resources/ru/mystamps/i18n/ValidationMessages_ru.properties
+++ b/src/main/resources/ru/mystamps/i18n/ValidationMessages_ru.properties
@@ -5,24 +5,24 @@ javax.validation.constraints.Max.message = Значение должно быт
 org.hibernate.validator.constraints.NotEmpty.message = Поле обязательно для заполнения
 org.hibernate.validator.constraints.URL.message = Значение должно быть корректным URL
 
-ru.mystamps.web.validation.jsr303.DenyValues.message = Неправильное значение
-ru.mystamps.web.validation.jsr303.FieldsMismatch.message = Поле '{second}' не должно совпадать с '{first}'
-ru.mystamps.web.validation.jsr303.FieldsMatch.message = Поле '{second}' должно совпадать с '{first}'
-ru.mystamps.web.validation.jsr303.UniqueLogin.message = Логин уже существует
-ru.mystamps.web.validation.jsr303.UniqueCountryName.message = Страна уже есть в базе
-ru.mystamps.web.validation.jsr303.UniqueCategoryName.message = Категория уже есть в базе
-ru.mystamps.web.validation.jsr303.UniqueCountrySlug.message = Страна с похожим названием уже есть в базе
-ru.mystamps.web.validation.jsr303.UniqueCategorySlug.message = Категория с похожим названием уже есть в базе
-ru.mystamps.web.validation.jsr303.ExistingActivationKey.message = Неправильный код активации
-ru.mystamps.web.validation.jsr303.Email.message = Неправильный адрес электронной почты
-ru.mystamps.web.validation.jsr303.ReleaseDateIsNotInFuture.message = Дата выпуска не может быть в будущем
-ru.mystamps.web.validation.jsr303.NotEmptyFilename.message = Поле обязательно для заполнения
-ru.mystamps.web.validation.jsr303.NotEmptyFile.message = Файл не должен быть пустым
-ru.mystamps.web.validation.jsr303.CatalogNumbers.message = Значение должно быть списком чисел через запятую
-ru.mystamps.web.validation.jsr303.NotNullIfFirstField.message = Поле '{second}' обязательно для заполнения
-ru.mystamps.web.validation.jsr303.Price.message = Некорректное значение
-ru.mystamps.web.validation.jsr303.ImageFile.message = Не удалось определить тип файла. Должен быть изображением в формате JPEG или PNG
-ru.mystamps.web.validation.jsr303.MaxFileSize.message = Размер файла должен быть не более {value} ${unit.name().equals('Mbytes') ? 'Мбайт' : unit.name().equals('Kbytes') ? 'Кбайт' : 'байт'}
+ru.mystamps.web.support.beanvalidation.DenyValues.message = Неправильное значение
+ru.mystamps.web.support.beanvalidation.FieldsMismatch.message = Поле '{second}' не должно совпадать с '{first}'
+ru.mystamps.web.support.beanvalidation.FieldsMatch.message = Поле '{second}' должно совпадать с '{first}'
+ru.mystamps.web.support.beanvalidation.UniqueLogin.message = Логин уже существует
+ru.mystamps.web.support.beanvalidation.UniqueCountryName.message = Страна уже есть в базе
+ru.mystamps.web.support.beanvalidation.UniqueCategoryName.message = Категория уже есть в базе
+ru.mystamps.web.support.beanvalidation.UniqueCountrySlug.message = Страна с похожим названием уже есть в базе
+ru.mystamps.web.support.beanvalidation.UniqueCategorySlug.message = Категория с похожим названием уже есть в базе
+ru.mystamps.web.support.beanvalidation.ExistingActivationKey.message = Неправильный код активации
+ru.mystamps.web.support.beanvalidation.Email.message = Неправильный адрес электронной почты
+ru.mystamps.web.support.beanvalidation.ReleaseDateIsNotInFuture.message = Дата выпуска не может быть в будущем
+ru.mystamps.web.support.beanvalidation.NotEmptyFilename.message = Поле обязательно для заполнения
+ru.mystamps.web.support.beanvalidation.NotEmptyFile.message = Файл не должен быть пустым
+ru.mystamps.web.support.beanvalidation.CatalogNumbers.message = Значение должно быть списком чисел через запятую
+ru.mystamps.web.support.beanvalidation.NotNullIfFirstField.message = Поле '{second}' обязательно для заполнения
+ru.mystamps.web.support.beanvalidation.Price.message = Некорректное значение
+ru.mystamps.web.support.beanvalidation.ImageFile.message = Не удалось определить тип файла. Должен быть изображением в формате JPEG или PNG
+ru.mystamps.web.support.beanvalidation.MaxFileSize.message = Размер файла должен быть не более {value} ${unit.name().equals('Mbytes') ? 'Мбайт' : unit.name().equals('Kbytes') ? 'Кбайт' : 'байт'}
 
 value.too-short = Значение должно быть не менее {min} символов
 value.too-long = Значение должно быть не более {max} символов
diff --git a/src/test/groovy/ru/mystamps/web/service/CategoryServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/service/CategoryServiceImplTest.groovy
index cba0bf6c71..a7aed315fe 100644
--- a/src/test/groovy/ru/mystamps/web/service/CategoryServiceImplTest.groovy
+++ b/src/test/groovy/ru/mystamps/web/service/CategoryServiceImplTest.groovy
@@ -22,7 +22,7 @@ import spock.lang.Unroll
 
 import ru.mystamps.web.dao.CategoryDao
 import ru.mystamps.web.dao.dto.AddCategoryDbDto
-import ru.mystamps.web.model.AddCategoryForm
+import ru.mystamps.web.controller.dto.AddCategoryForm
 import ru.mystamps.web.dao.dto.LinkEntityDto
 import ru.mystamps.web.tests.DateUtils
 import ru.mystamps.web.util.SlugUtils
diff --git a/src/test/groovy/ru/mystamps/web/service/CountryServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/service/CountryServiceImplTest.groovy
index 9e5b4298e6..d627735818 100644
--- a/src/test/groovy/ru/mystamps/web/service/CountryServiceImplTest.groovy
+++ b/src/test/groovy/ru/mystamps/web/service/CountryServiceImplTest.groovy
@@ -22,7 +22,7 @@ import spock.lang.Unroll
 
 import ru.mystamps.web.dao.CountryDao
 import ru.mystamps.web.dao.dto.AddCountryDbDto
-import ru.mystamps.web.model.AddCountryForm
+import ru.mystamps.web.controller.dto.AddCountryForm
 import ru.mystamps.web.dao.dto.LinkEntityDto
 import ru.mystamps.web.tests.DateUtils
 import ru.mystamps.web.util.SlugUtils
diff --git a/src/test/groovy/ru/mystamps/web/service/SeriesSalesServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/service/SeriesSalesServiceImplTest.groovy
index 52ab53be26..fa1c48b339 100644
--- a/src/test/groovy/ru/mystamps/web/service/SeriesSalesServiceImplTest.groovy
+++ b/src/test/groovy/ru/mystamps/web/service/SeriesSalesServiceImplTest.groovy
@@ -23,7 +23,7 @@ import spock.lang.Unroll
 import ru.mystamps.web.dao.SeriesSalesDao
 import ru.mystamps.web.dao.dto.AddSeriesSalesDbDto
 import ru.mystamps.web.dao.dto.Currency
-import ru.mystamps.web.model.AddSeriesSalesForm
+import ru.mystamps.web.controller.dto.AddSeriesSalesForm
 import ru.mystamps.web.tests.DateUtils
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
diff --git a/src/test/groovy/ru/mystamps/web/service/SeriesServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/service/SeriesServiceImplTest.groovy
index 2f4b1cfd49..33efd310c7 100644
--- a/src/test/groovy/ru/mystamps/web/service/SeriesServiceImplTest.groovy
+++ b/src/test/groovy/ru/mystamps/web/service/SeriesServiceImplTest.groovy
@@ -27,8 +27,8 @@ import ru.mystamps.web.dao.dto.AddSeriesDbDto
 import ru.mystamps.web.dao.dto.Currency
 import ru.mystamps.web.dao.dto.ImageInfoDto
 import ru.mystamps.web.dao.dto.SeriesFullInfoDto
-import ru.mystamps.web.model.AddImageForm
-import ru.mystamps.web.model.AddSeriesForm
+import ru.mystamps.web.controller.dto.AddImageForm
+import ru.mystamps.web.controller.dto.AddSeriesForm
 import ru.mystamps.web.dao.dto.LinkEntityDto
 import ru.mystamps.web.dao.dto.PurchaseAndSaleDto
 import ru.mystamps.web.dao.dto.SeriesInfoDto
diff --git a/src/test/groovy/ru/mystamps/web/service/TransactionParticipantServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/service/TransactionParticipantServiceImplTest.groovy
index ca429f2beb..f6b3f50174 100644
--- a/src/test/groovy/ru/mystamps/web/service/TransactionParticipantServiceImplTest.groovy
+++ b/src/test/groovy/ru/mystamps/web/service/TransactionParticipantServiceImplTest.groovy
@@ -22,7 +22,7 @@ import spock.lang.Specification
 import ru.mystamps.web.dao.TransactionParticipantDao
 import ru.mystamps.web.dao.dto.AddParticipantDbDto
 import ru.mystamps.web.dao.dto.EntityWithIdDto
-import ru.mystamps.web.model.AddParticipantForm
+import ru.mystamps.web.controller.dto.AddParticipantForm
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
 class TransactionParticipantServiceImplTest extends Specification {
diff --git a/src/test/groovy/ru/mystamps/web/service/UserServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/service/UserServiceImplTest.groovy
index 9d436d1209..2e4683c622 100644
--- a/src/test/groovy/ru/mystamps/web/service/UserServiceImplTest.groovy
+++ b/src/test/groovy/ru/mystamps/web/service/UserServiceImplTest.groovy
@@ -25,7 +25,7 @@ import ru.mystamps.web.dao.UserDao
 import ru.mystamps.web.dao.dto.AddUserDbDto
 import ru.mystamps.web.dao.dto.UserDetails
 import ru.mystamps.web.dao.dto.UsersActivationDto
-import ru.mystamps.web.model.ActivateAccountForm
+import ru.mystamps.web.controller.dto.ActivateAccountForm
 import ru.mystamps.web.tests.DateUtils
 
 @SuppressWarnings(['ClassJavadoc', 'MethodName', 'NoDef', 'NoTabCharacter', 'TrailingWhitespace'])
diff --git a/src/test/groovy/ru/mystamps/web/service/UsersActivationServiceImplTest.groovy b/src/test/groovy/ru/mystamps/web/service/UsersActivationServiceImplTest.groovy
index 5e6e39fb2d..b1872464a6 100644
--- a/src/test/groovy/ru/mystamps/web/service/UsersActivationServiceImplTest.groovy
+++ b/src/test/groovy/ru/mystamps/web/service/UsersActivationServiceImplTest.groovy
@@ -24,7 +24,7 @@ import ru.mystamps.web.dao.UsersActivationDao
 import ru.mystamps.web.dao.dto.AddUsersActivationDbDto
 import ru.mystamps.web.dao.dto.UsersActivationDto
 import ru.mystamps.web.dao.dto.UsersActivationFullDto
-import ru.mystamps.web.model.RegisterAccountForm
+import ru.mystamps.web.controller.dto.RegisterAccountForm
 import ru.mystamps.web.service.dto.SendUsersActivationDto
 import ru.mystamps.web.tests.DateUtils
 import ru.mystamps.web.validation.ValidationRules
diff --git a/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserActivateAccount.java b/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserActivateAccount.java
index 9e98bfbbc2..b97fc322a6 100644
--- a/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserActivateAccount.java
+++ b/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserActivateAccount.java
@@ -147,7 +147,7 @@ public void loginShouldBeUnique() {
 		
 		assertThat(page)
 			.field("login")
-			.hasError(tr("ru.mystamps.web.validation.jsr303.UniqueLogin.message"));
+			.hasError(tr("ru.mystamps.web.support.beanvalidation.UniqueLogin.message"));
 	}
 
 	@Test(groups = "invalid", dependsOnGroups = "std", dataProvider = "invalidLogins")
@@ -280,7 +280,7 @@ public void wrongActivationKeyShouldBeRejected() {
 		
 		assertThat(page)
 			.field("activationKey")
-			.hasError(tr("ru.mystamps.web.validation.jsr303.ExistingActivationKey.message"));
+			.hasError(tr("ru.mystamps.web.support.beanvalidation.ExistingActivationKey.message"));
 	}
 	
 	@Test(groups = "logic", dependsOnGroups = { "std", "invalid", "valid", "misc" })
diff --git a/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserRegisterAccount.java b/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserRegisterAccount.java
index a682adb62e..8c6a10f912 100644
--- a/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserRegisterAccount.java
+++ b/src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserRegisterAccount.java
@@ -182,7 +182,7 @@ public void emailWithActivationKeyShouldBeSentAfterRegistration()
 	
 	@DataProvider(name = "invalidEmails")
 	public Object[][] getInvalidEmails() {
-		String expectedErrorMessage = tr("ru.mystamps.web.validation.jsr303.Email.message");
+		String expectedErrorMessage = tr("ru.mystamps.web.support.beanvalidation.Email.message");
 		
 		return new Object[][] {
 			{"login", expectedErrorMessage},
diff --git a/src/test/java/ru/mystamps/web/tests/cases/WhenUserAddSeries.java b/src/test/java/ru/mystamps/web/tests/cases/WhenUserAddSeries.java
index 5c6d09bd31..0c82b21034 100644
--- a/src/test/java/ru/mystamps/web/tests/cases/WhenUserAddSeries.java
+++ b/src/test/java/ru/mystamps/web/tests/cases/WhenUserAddSeries.java
@@ -213,7 +213,7 @@ public void imageSizeMustBeGreaterThanZero() {
 		
 		assertThat(page)
 			.field("image")
-			.hasError(tr("ru.mystamps.web.validation.jsr303.NotEmptyFile.message"));
+			.hasError(tr("ru.mystamps.web.support.beanvalidation.NotEmptyFile.message"));
 	}
 	
 	@Test(groups = "misc", dependsOnGroups = "std")
@@ -385,7 +385,7 @@ public Object[][] getValidCatalogNumbers() {
 	@DataProvider(name = "invalidCatalogNumbers")
 	public Object[][] getInvalidCatalogNumbers() {
 		String expectedErrorMessage =
-			tr("ru.mystamps.web.validation.jsr303.CatalogNumbers.message");
+			tr("ru.mystamps.web.support.beanvalidation.CatalogNumbers.message");
 		
 		return new Object[][] {
 			{"t", expectedErrorMessage},
@@ -402,7 +402,7 @@ public Object[][] getInvalidCatalogNumbers() {
 	
 	@DataProvider(name = "invalidCatalogPrices")
 	public Object[][] getInvalidCatalogPrices() {
-		String expectedErrorMessage = tr("ru.mystamps.web.validation.jsr303.Price.message");
+		String expectedErrorMessage = tr("ru.mystamps.web.support.beanvalidation.Price.message");
 		
 		return new Object[][] {
 			{"0", expectedErrorMessage},