diff --git a/.gitignore b/.gitignore
index fa44c6e..403993d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,4 @@ db.sqlite3
 venv
 .vscode
 /media
-settings.py
+settings.py
\ No newline at end of file
diff --git a/kivi_cars/kivi_cars/settings.py b/kivi_cars/kivi_cars/settings.py
index 00d2354..0162ac9 100644
--- a/kivi_cars/kivi_cars/settings.py
+++ b/kivi_cars/kivi_cars/settings.py
@@ -41,12 +41,9 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
 
-    'corsheaders',
-
 
     'rest_framework',
-    'Generator',
-    'cars'
+    'cars',
 ]
 
 MIDDLEWARE = [
@@ -57,21 +54,9 @@ MIDDLEWARE = [
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'corsheaders.middleware.CorsMiddleware',
-    'django.middleware.common.CommonMiddleware',
 ]
 
-CORS_ALLOWED_ORIGINS = [
-    "http://localhost:3000",
-    "http://127.0.0.1:3000"
-]
 
-CORS_ALLOW_METHODS = [
-    'DELETE',
-    'GET',
-    'POST',
-    'PUT',
-]
 
 ROOT_URLCONF = 'kivi_cars.urls'
 
diff --git a/kivi_cars/kivi_cars/urls.py b/kivi_cars/kivi_cars/urls.py
index eef5e27..9a25c19 100644
--- a/kivi_cars/kivi_cars/urls.py
+++ b/kivi_cars/kivi_cars/urls.py
@@ -20,6 +20,5 @@ from django.urls import path
 urlpatterns = [
     path('', include("cars.urls")),
     path('admin/', admin.site.urls),
-    # path('generator/', include("Generator.urls")),
 ]
 
diff --git a/kivi_cars/Generator/__init__.py b/kivi_listener/Generator/__init__.py
similarity index 100%
rename from kivi_cars/Generator/__init__.py
rename to kivi_listener/Generator/__init__.py
diff --git a/kivi_cars/Generator/admin.py b/kivi_listener/Generator/admin.py
similarity index 100%
rename from kivi_cars/Generator/admin.py
rename to kivi_listener/Generator/admin.py
diff --git a/kivi_cars/Generator/apps.py b/kivi_listener/Generator/apps.py
similarity index 100%
rename from kivi_cars/Generator/apps.py
rename to kivi_listener/Generator/apps.py
diff --git a/kivi_cars/Generator/migrations/__init__.py b/kivi_listener/Generator/migrations/__init__.py
similarity index 100%
rename from kivi_cars/Generator/migrations/__init__.py
rename to kivi_listener/Generator/migrations/__init__.py
diff --git a/kivi_cars/Generator/models.py b/kivi_listener/Generator/models.py
similarity index 100%
rename from kivi_cars/Generator/models.py
rename to kivi_listener/Generator/models.py
diff --git a/kivi_cars/Generator/tests.py b/kivi_listener/Generator/tests.py
similarity index 100%
rename from kivi_cars/Generator/tests.py
rename to kivi_listener/Generator/tests.py
diff --git a/kivi_cars/Generator/urls.py b/kivi_listener/Generator/urls.py
similarity index 100%
rename from kivi_cars/Generator/urls.py
rename to kivi_listener/Generator/urls.py
diff --git a/kivi_cars/Generator/views.py b/kivi_listener/Generator/views.py
similarity index 100%
rename from kivi_cars/Generator/views.py
rename to kivi_listener/Generator/views.py
diff --git a/kivi_listener/kivi_listener/__init__.py b/kivi_listener/kivi_listener/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/kivi_listener/kivi_listener/asgi.py b/kivi_listener/kivi_listener/asgi.py
new file mode 100644
index 0000000..8ae8bfb
--- /dev/null
+++ b/kivi_listener/kivi_listener/asgi.py
@@ -0,0 +1,16 @@
+"""
+ASGI config for kivi_listener project.
+
+It exposes the ASGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/4.0/howto/deployment/asgi/
+"""
+
+import os
+
+from django.core.asgi import get_asgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'kivi_listener.settings')
+
+application = get_asgi_application()
diff --git a/kivi_listener/kivi_listener/urls.py b/kivi_listener/kivi_listener/urls.py
new file mode 100644
index 0000000..bf462ed
--- /dev/null
+++ b/kivi_listener/kivi_listener/urls.py
@@ -0,0 +1,24 @@
+"""kivi_listener URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/4.0/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  path('', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.urls import include, path
+    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
+"""
+
+from django.urls.conf import include
+from django.contrib import admin
+from django.urls import path
+
+urlpatterns = [
+    path('admin/', admin.site.urls),
+    path('generator/', include("Generator.urls")),
+]
diff --git a/kivi_listener/kivi_listener/wsgi.py b/kivi_listener/kivi_listener/wsgi.py
new file mode 100644
index 0000000..788aeac
--- /dev/null
+++ b/kivi_listener/kivi_listener/wsgi.py
@@ -0,0 +1,16 @@
+"""
+WSGI config for kivi_listener project.
+
+It exposes the WSGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/4.0/howto/deployment/wsgi/
+"""
+
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'kivi_listener.settings')
+
+application = get_wsgi_application()
diff --git a/kivi_listener/manage.py b/kivi_listener/manage.py
new file mode 100644
index 0000000..b9933be
--- /dev/null
+++ b/kivi_listener/manage.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+"""Django's command-line utility for administrative tasks."""
+import os
+import sys
+
+
+def main():
+    """Run administrative tasks."""
+    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'kivi_listener.settings')
+    try:
+        from django.core.management import execute_from_command_line
+    except ImportError as exc:
+        raise ImportError(
+            "Couldn't import Django. Are you sure it's installed and "
+            "available on your PYTHONPATH environment variable? Did you "
+            "forget to activate a virtual environment?"
+        ) from exc
+    execute_from_command_line(sys.argv)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/kivi_listener/searches/__init__.py b/kivi_listener/searches/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/kivi_listener/searches/admin.py b/kivi_listener/searches/admin.py
new file mode 100644
index 0000000..8c38f3f
--- /dev/null
+++ b/kivi_listener/searches/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/kivi_listener/searches/apps.py b/kivi_listener/searches/apps.py
new file mode 100644
index 0000000..7fe5b36
--- /dev/null
+++ b/kivi_listener/searches/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class SearchesConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'searches'
diff --git a/kivi_listener/searches/migrations/__init__.py b/kivi_listener/searches/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/kivi_listener/searches/models.py b/kivi_listener/searches/models.py
new file mode 100644
index 0000000..d2fe086
--- /dev/null
+++ b/kivi_listener/searches/models.py
@@ -0,0 +1,92 @@
+from django.db import models
+from django.contrib.postgres.fields import ArrayField
+
+# Create your models here.
+
+class Search(models.Model):
+    HEXA_CODE = models.CharField(max_length=16, null=True)
+    Kategorija = models.CharField(max_length=30, null=True)
+    Cijena_od = models.CharField(max_length=30, null=True)
+    Cijena_do = models.CharField(max_length=30, null=True)
+    Stanje = models.CharField(max_length=30, null=True)
+    Lokacija_kanton = models.CharField(max_length=50, null=True)
+    Lokacija_grad = models.CharField(max_length=50, null=True)
+    Brend = models.CharField(max_length=30, null=True)
+    Model = models.CharField(max_length=30, null=True)
+    Godiste_od = models.CharField(max_length=30, null=True)
+    Godiste_do = models.CharField(max_length=30, null=True)
+    Kilometraža_od = models.CharField(max_length=30, null=True)
+    Kilometraža_do = models.CharField(max_length=30, null=True)
+    Kilovata_od = models.CharField(max_length=30, null=True)
+    Kilovata_do = models.CharField(max_length=30, null=True)
+    Kubikaza_od = models.CharField(max_length=30, null=True)
+    Kubikaza_do = models.CharField(max_length=30, null=True)
+    Gorivo = models.CharField(max_length=30, null=True)
+    Broj_vrata = models.CharField(max_length=30, null=True)
+    Konjskih_snaga_od = models.CharField(max_length=30, null=True)
+    Konjskih_snaga_do = models.CharField(max_length=30, null=True)
+    Metalik = models.CharField(max_length=30, null=True)
+    Masa_Tezina_kg = models.CharField(max_length=30, null=True)
+    Tip = models.CharField(max_length=30, null=True)
+    Pogon = models.CharField(max_length=30, null=True)
+    Emisioni_standard = models.CharField(max_length=30, null=True)
+    Velicina_felgi = models.CharField(max_length=30, null=True)
+    Transmisija = models.CharField(max_length=30, null=True)
+    Broj_stepeni_prijenosa = models.CharField(max_length=30, null=True)
+    Boja = models.CharField(max_length=30, null=True)
+    Muzika_ozvucenje = models.CharField(max_length=30, null=True)
+    Parking_senzori= models.CharField(max_length=30, null=True)
+    Parking_kamera = models.CharField(max_length=30, null=True)
+    Registrovan_do = models.CharField(max_length=30, null=True)
+    Godina_prve_registracije = models.CharField(max_length=30, null=True)
+    Broj_prethodnih_vlasnika = models.CharField(max_length=30, null=True)
+    Posjeduje_gume = models.CharField(max_length=30, null=True)
+    Visezonska_klima = models.CharField(max_length=30, null=True)
+    Rolo_zavjese = models.CharField(max_length=30, null=True)
+    Svjetla = models.CharField(max_length=30, null=True)
+    Zastita_Blokada = models.CharField(max_length=30, null=True)
+    Sjedecih_mjesta = models.CharField(max_length=30, null=True)
+    Turbo = models.CharField(max_length=30, null=True)
+    DPF_FAP_filter = models.CharField(max_length=30, null=True)
+    Strane_tablice = models.CharField(max_length=30, null=True)
+    Ocarinjen = models.CharField(max_length=30, null=True)
+    Prilagodjen_invalidima = models.CharField(max_length=30, null=True)
+    Servo_volan = models.CharField(max_length=30, null=True)
+    Tempomat = models.CharField(max_length=30, null=True)
+    ESP = models.CharField(max_length=30, null=True)
+    El_podizaci_stakala = models.CharField(max_length=30, null=True)
+    Senzor_mrtvog_ugla = models.CharField(max_length=30, null=True)
+    Digitalna_klima = models.CharField(max_length=30, null=True)
+    Touch_screen_ekran = models.CharField(max_length=30, null=True)
+    Panorama_krov = models.CharField(max_length=30, null=True)
+    Koza = models.CharField(max_length=30, null=True)
+    Masaza_sjedista = models.CharField(max_length=30, null=True)
+    El_pomjeranje_sjedista= models.CharField(max_length=30, null=True)
+    Senzor_auto_svjetla = models.CharField(max_length=30, null=True)
+    Alarm = models.CharField(max_length=30, null=True)
+    Daljinsko_otkljucavanje = models.CharField(max_length=30, null=True)
+    Auto_kuka = models.CharField(max_length=30, null=True)
+    Udaren = models.CharField(max_length=30, null=True)
+    Start_Stop_sistem = models.CharField(max_length=30, null=True)
+    Park_assist = models.CharField(max_length=30, null=True)
+    Registrovan = models.CharField(max_length=30, null=True)
+    Na_lizingu = models.CharField(max_length=30, null=True)
+    Servisna_knjiga = models.CharField(max_length=30, null=True)
+    Komande_na_volanu = models.CharField(max_length=30, null=True)
+    ABS = models.CharField(max_length=30, null=True)
+    Airbag = models.CharField(max_length=30, null=True)
+    Elektricni_retrovizori = models.CharField(max_length=30, null=True)
+    Klima = models.CharField(max_length=30, null=True)
+    Navigacija = models.CharField(max_length=30, null=True)
+    Siber= models.CharField(max_length=30, null=True)
+    Naslon_za_ruku= models.CharField(max_length=30, null=True)
+    Hladjenje_sjedista = models.CharField(max_length=30, null=True)
+    Grijanje_sjedista = models.CharField(max_length=30, null=True)
+    Memorija_sjedista = models.CharField(max_length=30, null=True)
+    Alu_felge = models.CharField(max_length=30, null=True)
+    Centralna_brava = models.CharField(max_length=30, null=True)
+    Oldtimer = models.CharField(max_length=30, null=True)
+    ISOFIX = models.CharField(max_length=30, null=True)
+    Email = models.EmailField(max_length=254, null=True)
+    Send_Time = models.CharField(max_length=15, null=True)
+    Olx_ids = ArrayField(models.CharField(max_length=10, null=True))
diff --git a/kivi_listener/searches/serializers.py b/kivi_listener/searches/serializers.py
new file mode 100644
index 0000000..e69de29
diff --git a/kivi_listener/searches/tests.py b/kivi_listener/searches/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/kivi_listener/searches/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/kivi_listener/searches/urls.py b/kivi_listener/searches/urls.py
new file mode 100644
index 0000000..e69de29
diff --git a/kivi_listener/searches/views.py b/kivi_listener/searches/views.py
new file mode 100644
index 0000000..91ea44a
--- /dev/null
+++ b/kivi_listener/searches/views.py
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.