diff --git a/src/App.tsx b/src/App.tsx
index 458470b04401c6a1593bef169628b611cd9916d9..9d9a8cf2fb268834f1755ec0703b0b474d02b9fc 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,8 +1,8 @@
 import React, { FC } from 'react';
 import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
-import { HomePage } from './components/HomePage/HomePage';
-import { AuthUser } from './components/AuthUser/AuthUser';
-import { LandingPage } from './components/LandingPage/LandingPage';
+import { HomePage } from 'components/HomePage/HomePage';
+import { AuthUser } from 'components/AuthUser/AuthUser';
+import { LandingPage } from 'components/LandingPage/LandingPage';
 
 export const App: FC = () => (
   <Router>
diff --git a/src/components/AuthUser/SignInForm/InputField.tsx b/src/components/AuthUser/SignInForm/InputField/InputField.tsx
similarity index 100%
rename from src/components/AuthUser/SignInForm/InputField.tsx
rename to src/components/AuthUser/SignInForm/InputField/InputField.tsx
diff --git a/src/components/AuthUser/SignInForm/SignInForm.tsx b/src/components/AuthUser/SignInForm/SignInForm.tsx
index 1de3d63935aab54bfdae5c3df2cff294b3577a29..9432ee95163cfc8cc887a381c3dbae84ef287d13 100644
--- a/src/components/AuthUser/SignInForm/SignInForm.tsx
+++ b/src/components/AuthUser/SignInForm/SignInForm.tsx
@@ -1,11 +1,10 @@
 import React, { FC } from 'react';
 import axios from 'axios';
 import { SubmitHandler, useForm } from 'react-hook-form';
-import { useIntl } from 'react-intl';
 import { createStyles, makeStyles, Theme } from '@material-ui/core/styles';
 import { Button } from '@material-ui/core';
 import { DevTool } from '@hookform/devtools';
-import { InputField } from './InputField';
+import { InputField } from 'components/AuthUser/SignInForm/InputField/InputField';
 
 const useStyles = makeStyles((theme: Theme) =>
   createStyles({
@@ -54,7 +53,6 @@ export const SignInForm: FC = () => {
       },
     );
   };
-  const intl = useIntl();
   const classes = useStyles();
   return (
     <>
@@ -71,12 +69,12 @@ export const SignInForm: FC = () => {
               /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i.test(value),
             required: {
               value: true,
-              message: intl.formatMessage({ id: 'email' }),
+              message: 'Email is not valid',
             },
           }}
-          label={intl.formatMessage({ id: 'email' })}
+          label="Email"
           error={!!errors.email}
-          errorMessage={intl.formatMessage({ id: 'email-error' })}
+          errorMessage="Insert email"
         />
 
         <InputField
@@ -87,20 +85,20 @@ export const SignInForm: FC = () => {
             maxLength: 60,
             required: {
               value: true,
-              message: intl.formatMessage({ id: 'password' }),
+              message: 'Insert valid password',
             },
           }}
-          label={intl.formatMessage({ id: 'password' })}
+          label="Password"
           error={!!errors.password}
-          errorMessage={intl.formatMessage({ id: 'password-error' })}
+          errorMessage="Insert valid password"
         />
 
         <Button
+          data-testid="Submit"
           type="submit"
           fullWidth
           variant="contained"
           color="primary"
-          data-testid="Submit"
           className={classes.submit}
         >
           Sign In
diff --git a/src/index.tsx b/src/index.tsx
index 0fccccb0ddf325834eeac345df5804ae6cae64ef..295b12325a3d7f53544b079f13cd9322206f054c 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,17 +1,12 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { IntlProvider } from 'react-intl';
 import CssBaseline from '@material-ui/core/CssBaseline';
-import MESSAGES_EN from './intl/en.json';
-import { App } from './App';
+import { App } from 'App';
 
 ReactDOM.render(
   <React.StrictMode>
-    <IntlProvider locale="en" messages={MESSAGES_EN}>
-      <CssBaseline />
-      <App />
-    </IntlProvider>
-    ,
+    <CssBaseline />
+    <App />,
   </React.StrictMode>,
   document.getElementById('root'),
 );
diff --git a/src/intl/en.json b/src/intl/en.json
deleted file mode 100644
index 347550bbe2d981d469c98efa089b3f5a97b1aaed..0000000000000000000000000000000000000000
--- a/src/intl/en.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "email": "Email address",
-    "password": "Password",
-    "email-error": "Insert valid email address",
-    "password-error": "Insert valid password"
-}
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 9d379a3c4af84ae50928aaef7dd3a3d9cadeacde..20f8c4c8d0a696cede05d135f90a61f3c823f5ca 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,7 +14,8 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react-jsx"
+    "jsx": "react-jsx",
+    "baseUrl": "src",
   },
   "include": ["src"]
 }