diff --git a/packages/login/package.json b/packages/login/package.json
index 89d00e66..bb817d52 100644
--- a/packages/login/package.json
+++ b/packages/login/package.json
@@ -39,10 +39,11 @@
     },
     "dependencies": {
         "axios": "^0.21.0",
+        "file-loader": "^6.2.0",
         "react": "^17.0.1",
         "react-dom": "^17.0.1",
         "react-intl": "^5.10.6",
         "react-recaptcha-v3": "^2.0.1",
         "react-router-dom": "^5.2.0"
     }
-}
\ No newline at end of file
+}
diff --git a/packages/login/src/app.tsx b/packages/login/src/app.tsx
index 3488a762..090c618f 100644
--- a/packages/login/src/app.tsx
+++ b/packages/login/src/app.tsx
@@ -1,12 +1,12 @@
 import React, { useEffect, useState } from 'react';
-import LoginPage from './LoginPage';
-import { RegistrationSuccessPage, RegistationFormPage } from './RegistrationPage';
+import LoginPage from './components/LoginPage';
+import { RegistrationSuccessPage, RegistationFormPage } from './components/RegistrationPage';
 import { IntlProvider } from 'react-intl'
 
 import {
   Route,
   Switch,
-  Redirect
+  Redirect,
 } from 'react-router-dom';
 
 function loadLocaleData(language: string) {
diff --git a/packages/login/src/Footer.tsx b/packages/login/src/components/Footer.tsx
similarity index 100%
rename from packages/login/src/Footer.tsx
rename to packages/login/src/components/Footer.tsx
diff --git a/packages/login/src/Header.tsx b/packages/login/src/components/Header.tsx
similarity index 92%
rename from packages/login/src/Header.tsx
rename to packages/login/src/components/Header.tsx
index 96d0774c..101fcb7d 100644
--- a/packages/login/src/Header.tsx
+++ b/packages/login/src/components/Header.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormattedMessage } from 'react-intl'
 
-//const logo = require('./images/header-logo.png')
+//const logo = require('../images/header-logo.png')
 
 interface HeaderProps {
   type: string;
@@ -33,7 +33,7 @@ class Header extends React.Component<HeaderProps, HeaderProps> {
     return (
       <nav>
         <div className="header">
-          <span className="header-logo"><a href="/"><img src="" alt="logo" /></a></span>
+          <span className="header-logo"><a href="/"><img src={"logo"} alt="logo" /></a></span>
           {text}
           {signUpButton}
           {signInButton}
diff --git a/packages/login/src/LoginPage.tsx b/packages/login/src/components/LoginPage.tsx
similarity index 98%
rename from packages/login/src/LoginPage.tsx
rename to packages/login/src/components/LoginPage.tsx
index 81b39de2..0d85f12a 100644
--- a/packages/login/src/LoginPage.tsx
+++ b/packages/login/src/components/LoginPage.tsx
@@ -4,7 +4,7 @@ import { FormattedMessage, useIntl } from 'react-intl'
 import Header from './Header'
 import Footer from './Footer'
 
-const css = require('./css/login.css')
+const css = require('../css/login.css')
 
 
 
diff --git a/packages/login/src/RegistrationPage.tsx b/packages/login/src/components/RegistrationPage.tsx
similarity index 99%
rename from packages/login/src/RegistrationPage.tsx
rename to packages/login/src/components/RegistrationPage.tsx
index 99902a25..c449ab91 100644
--- a/packages/login/src/RegistrationPage.tsx
+++ b/packages/login/src/components/RegistrationPage.tsx
@@ -8,7 +8,7 @@ import { ReCaptcha } from 'react-recaptcha-v3'
 import Header from './Header';
 import Footer from './Footer';
 
-const css = require('./css/registration.css');
+const css = require('../css/registration.css');
 
 
 interface ErrorMessageDialogProps {
diff --git a/yarn.lock b/yarn.lock
index d6e8e673..c86ce207 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4390,7 +4390,7 @@ file-entry-cache@^6.0.0:
   dependencies:
     flat-cache "^3.0.4"
 
-file-loader@~6.2.0:
+file-loader@^6.2.0, file-loader@~6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.2.0.tgz#baef7cf8e1840df325e4390b4484879480eebe4d"
   integrity sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==