diff --git a/src/client/stores/CalculationStore/Effects/lib/additionalData.ts b/src/client/stores/CalculationStore/Effects/actions/calculate/additionalData.ts
similarity index 100%
rename from src/client/stores/CalculationStore/Effects/lib/additionalData.ts
rename to src/client/stores/CalculationStore/Effects/actions/calculate/additionalData.ts
diff --git a/src/client/stores/CalculationStore/Effects/lib/checkValidation.ts b/src/client/stores/CalculationStore/Effects/actions/calculate/checkValidation.ts
similarity index 100%
rename from src/client/stores/CalculationStore/Effects/lib/checkValidation.ts
rename to src/client/stores/CalculationStore/Effects/actions/calculate/checkValidation.ts
diff --git a/src/client/stores/CalculationStore/Effects/actions/calculate.js b/src/client/stores/CalculationStore/Effects/actions/calculate/index.js
similarity index 90%
rename from src/client/stores/CalculationStore/Effects/actions/calculate.js
rename to src/client/stores/CalculationStore/Effects/actions/calculate/index.js
index 9278d82..c6e7050 100644
--- a/src/client/stores/CalculationStore/Effects/actions/calculate.js
+++ b/src/client/stores/CalculationStore/Effects/actions/calculate/index.js
@@ -3,12 +3,12 @@ import { openNotification } from 'client/Elements/Notification';
 import CalculationService from 'client/services/CalculationService';
 import { resultsValues } from 'core/types/Calculation/Store/values';
 import { ElementStatus } from 'core/types/statuses';
-import CalculationStore from '../..';
-import getAdditionalData from '../lib/additionalData';
-import checkValidation from '../lib/checkValidation';
-import prepareCalculationData from '../lib/prepareData';
-import results from '../lib/results';
-import validate from '../lib/validate';
+import CalculationStore from '../../..';
+import getAdditionalData from './additionalData';
+import checkValidation from './checkValidation';
+import prepareCalculationData from './prepareData';
+import results from './results';
+import validate from './validate';
 
 const cleanResults = () => {
   for (let resultValue of resultsValues) {
@@ -32,7 +32,7 @@ function unlockButtons() {
   }, BUTTONS_TIMEOUT);
 }
 
-export default () => {
+export default async () => {
   validate();
   const { invalidElements, invalidTables } = checkValidation();
   if (invalidElements.length > 0 || invalidTables.length > 0) {
diff --git a/src/client/stores/CalculationStore/Effects/lib/prepareData.ts b/src/client/stores/CalculationStore/Effects/actions/calculate/prepareData.ts
similarity index 99%
rename from src/client/stores/CalculationStore/Effects/lib/prepareData.ts
rename to src/client/stores/CalculationStore/Effects/actions/calculate/prepareData.ts
index 573cf52..e1c383e 100644
--- a/src/client/stores/CalculationStore/Effects/lib/prepareData.ts
+++ b/src/client/stores/CalculationStore/Effects/actions/calculate/prepareData.ts
@@ -1,4 +1,4 @@
-import { calcPrice } from './tools';
+import { calcPrice } from '../../lib/tools';
 import valuesConstants from 'core/constants/values';
 import { PaymentRow, PreparedValues } from 'core/types/Calculation/Prepare';
 import { IPreparedData } from 'core/types/Calculation/Requests';
diff --git a/src/client/stores/CalculationStore/Effects/lib/results.ts b/src/client/stores/CalculationStore/Effects/actions/calculate/results.ts
similarity index 100%
rename from src/client/stores/CalculationStore/Effects/lib/results.ts
rename to src/client/stores/CalculationStore/Effects/actions/calculate/results.ts
diff --git a/src/client/stores/CalculationStore/Effects/lib/validate.ts b/src/client/stores/CalculationStore/Effects/actions/calculate/validate.ts
similarity index 97%
rename from src/client/stores/CalculationStore/Effects/lib/validate.ts
rename to src/client/stores/CalculationStore/Effects/actions/calculate/validate.ts
index 99b8281..f575f9e 100644
--- a/src/client/stores/CalculationStore/Effects/lib/validate.ts
+++ b/src/client/stores/CalculationStore/Effects/actions/calculate/validate.ts
@@ -1,6 +1,6 @@
 import { elementsValues } from 'client/Containers/Calculation/lib/elements/values';
 import { TElements } from 'core/types/Calculation/Store/elements';
-import CalculationStore from '../..';
+import CalculationStore from '../../..';
 
 const VALIDATIONS = {
   IS_NULL: valueName => !CalculationStore.getValue(valueName),
@@ -21,7 +21,7 @@ const elementsValidations: TElements<any> = {
   selectRegionRegistration: VALIDATIONS.IS_NULL,
   selectTownRegistration: VALIDATIONS.IS_NULL,
   selectTarif: VALIDATIONS.IS_NULL,
-  selectRate: VALIDATIONS.IS_NULL,
+  // selectRate: VALIDATIONS.IS_NULL,
   selectRegistration: VALIDATIONS.IS_NULL,
   selectLeaseObjectCategory: VALIDATIONS.IS_NULL,
   tbxLeasingPeriod: valueName => CalculationStore.getValue(valueName) < 7,
diff --git a/src/client/stores/CalculationStore/index.ts b/src/client/stores/CalculationStore/index.ts
index 9b8f82d..1dfc2ce 100644
--- a/src/client/stores/CalculationStore/index.ts
+++ b/src/client/stores/CalculationStore/index.ts
@@ -9,7 +9,7 @@ import staticData from './Data/static';
 import modal from './Data/modal';
 
 import computedEffects from './Effects/computed';
-import actionsEffects from 'client/stores/CalculationStore/Effects/actions';
+import actionsEffects from './Effects/actions';
 import autorunEffects from './Effects/autorun';
 import reactionEffects from './Effects/reactions';