diff --git a/app/build.gradle b/app/build.gradle
index 7d86109..fda14d8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,7 +15,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "ee.taltech.iti0213.sportsapp"
+        applicationId 'ee.taltech.kilpkonn.sportsapp'
         minSdkVersion 21
         targetSdkVersion 30
         versionCode 1
diff --git a/app/src/androidTest/java/ee/taltech/iti0213/sportsapp/ExampleInstrumentedTest.kt b/app/src/androidTest/java/ee/taltech/kilpkonn/sportsapp/ExampleInstrumentedTest.kt
similarity index 94%
rename from app/src/androidTest/java/ee/taltech/iti0213/sportsapp/ExampleInstrumentedTest.kt
rename to app/src/androidTest/java/ee/taltech/kilpkonn/sportsapp/ExampleInstrumentedTest.kt
index 21d1ef1..c0b49ee 100644
--- a/app/src/androidTest/java/ee/taltech/iti0213/sportsapp/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/ee/taltech/kilpkonn/sportsapp/ExampleInstrumentedTest.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp
+package ee.taltech.kilpkonn.sportsapp
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1400ddc..7a69e3f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ee.taltech.iti0213.sportsapp">
+    package="ee.taltech.kilpkonn.sportsapp">
     <!--
          The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
          Google Maps Android API v2, but you must specify either coarse or fine
@@ -27,15 +27,15 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".activity.OverviewActivity"></activity>
+        <activity android:name="ee.taltech.kilpkonn.sportsapp.activity.OverviewActivity"></activity>
         <activity
-            android:name=".activity.SettingsActivity"
+            android:name="ee.taltech.kilpkonn.sportsapp.activity.SettingsActivity"
             android:launchMode="singleInstance" />
         <activity
-            android:name=".activity.HistoryActivity"
+            android:name="ee.taltech.kilpkonn.sportsapp.activity.HistoryActivity"
             android:launchMode="singleInstance" />
         <activity
-            android:name=".activity.DetailActivity"
+            android:name="ee.taltech.kilpkonn.sportsapp.activity.DetailActivity"
             android:launchMode="singleInstance" />
         <!--
              The API key for Google Maps-based APIs is defined as a string resource.
@@ -46,7 +46,7 @@
              You can define the keys for the debug and release targets in src/debug/ and src/release/.
         -->
         <activity
-            android:name=".activity.MapsActivity"
+            android:name="ee.taltech.kilpkonn.sportsapp.activity.MapsActivity"
             android:launchMode="singleInstance">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -59,7 +59,7 @@
         Requires buildTools SDK >= 29
         -->
         <service
-            android:name=".service.LocationService"
+            android:name="ee.taltech.kilpkonn.sportsapp.service.LocationService"
             android:enabled="true"
             android:exported="true"
             android:foregroundServiceType="location"
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/IRepository.kt b/app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/IRepository.kt
deleted file mode 100644
index b76ca5e..0000000
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/IRepository.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package ee.taltech.iti0213.sportsapp.db.repository
-
-interface IRepository {
-    fun close()
-}
\ No newline at end of file
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/C.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/C.kt
similarity index 99%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/C.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/C.kt
index 5dfc81c..55fed81 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/C.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/C.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp
+package ee.taltech.kilpkonn.sportsapp
 
 class C {
     companion object {
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/activity/DetailActivity.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/activity/DetailActivity.kt
similarity index 94%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/activity/DetailActivity.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/activity/DetailActivity.kt
index 691fd68..0c97421 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/activity/DetailActivity.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/activity/DetailActivity.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.activity
+package ee.taltech.kilpkonn.sportsapp.activity
 
 import android.annotation.SuppressLint
 import android.app.Activity
@@ -17,15 +17,15 @@ import android.widget.*
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import ee.taltech.iti0213.sportsapp.C
-import ee.taltech.iti0213.sportsapp.R
-import ee.taltech.iti0213.sportsapp.component.spinner.adapter.TrackTypeSpinnerAdapter
-import ee.taltech.iti0213.sportsapp.db.domain.User
-import ee.taltech.iti0213.sportsapp.db.repository.UserRepository
-import ee.taltech.iti0213.sportsapp.detector.FlingDetector
-import ee.taltech.iti0213.sportsapp.track.TrackType
-import ee.taltech.iti0213.sportsapp.track.converters.Converter
-import ee.taltech.iti0213.sportsapp.track.pracelable.DetailedTrackData
+import ee.taltech.kilpkonn.sportsapp.C
+import ee.taltech.kilpkonn.sportsapp.R
+import ee.taltech.kilpkonn.sportsapp.component.spinner.adapter.TrackTypeSpinnerAdapter
+import ee.taltech.kilpkonn.sportsapp.db.domain.User
+import ee.taltech.kilpkonn.sportsapp.db.repository.UserRepository
+import ee.taltech.kilpkonn.sportsapp.detector.FlingDetector
+import ee.taltech.kilpkonn.sportsapp.track.TrackType
+import ee.taltech.kilpkonn.sportsapp.track.converters.Converter
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.DetailedTrackData
 
 
 class DetailActivity : AppCompatActivity() {
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/activity/HistoryActivity.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/activity/HistoryActivity.kt
similarity index 92%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/activity/HistoryActivity.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/activity/HistoryActivity.kt
index 1e22c6e..12a9baa 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/activity/HistoryActivity.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/activity/HistoryActivity.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.activity
+package ee.taltech.kilpkonn.sportsapp.activity
 
 import android.Manifest
 import android.content.Intent
@@ -16,22 +16,22 @@ import androidx.core.app.ActivityCompat
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.textfield.TextInputLayout
-import ee.taltech.iti0213.sportsapp.C
-import ee.taltech.iti0213.sportsapp.R
-import ee.taltech.iti0213.sportsapp.component.imageview.TrackTypeIcons
-import ee.taltech.iti0213.sportsapp.component.spinner.ReplaySpinnerItems
-import ee.taltech.iti0213.sportsapp.component.spinner.adapter.HistorySpinnerAdapter
-import ee.taltech.iti0213.sportsapp.db.domain.TrackSummary
-import ee.taltech.iti0213.sportsapp.detector.FlingDetector
-import ee.taltech.iti0213.sportsapp.track.TrackType
-import ee.taltech.iti0213.sportsapp.track.converters.Converter
-import ee.taltech.iti0213.sportsapp.component.view.TrackIconImageView
-import ee.taltech.iti0213.sportsapp.db.ReadDatabaseTask
-import ee.taltech.iti0213.sportsapp.db.domain.User
-import ee.taltech.iti0213.sportsapp.db.repository.*
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.TrackLocation
-import ee.taltech.iti0213.sportsapp.util.TrackUtils
-import ee.taltech.iti0213.sportsapp.util.serializer.TrackSerializer
+import ee.taltech.kilpkonn.sportsapp.C
+import ee.taltech.kilpkonn.sportsapp.R
+import ee.taltech.kilpkonn.sportsapp.component.imageview.TrackTypeIcons
+import ee.taltech.kilpkonn.sportsapp.component.spinner.ReplaySpinnerItems
+import ee.taltech.kilpkonn.sportsapp.component.spinner.adapter.HistorySpinnerAdapter
+import ee.taltech.kilpkonn.sportsapp.db.domain.TrackSummary
+import ee.taltech.kilpkonn.sportsapp.detector.FlingDetector
+import ee.taltech.kilpkonn.sportsapp.track.TrackType
+import ee.taltech.kilpkonn.sportsapp.track.converters.Converter
+import ee.taltech.kilpkonn.sportsapp.component.view.TrackIconImageView
+import ee.taltech.kilpkonn.sportsapp.db.ReadDatabaseTask
+import ee.taltech.kilpkonn.sportsapp.db.domain.User
+import ee.taltech.kilpkonn.sportsapp.db.repository.*
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.TrackLocation
+import ee.taltech.kilpkonn.sportsapp.util.TrackUtils
+import ee.taltech.kilpkonn.sportsapp.util.serializer.TrackSerializer
 
 class HistoryActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/activity/MapsActivity.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/activity/MapsActivity.kt
similarity index 96%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/activity/MapsActivity.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/activity/MapsActivity.kt
index 49e9069..4c49a41 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/activity/MapsActivity.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/activity/MapsActivity.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.activity
+package ee.taltech.kilpkonn.sportsapp.activity
 
 import android.Manifest
 import android.animation.ArgbEvaluator
@@ -41,29 +41,29 @@ import com.google.android.gms.maps.SupportMapFragment
 import com.google.android.gms.maps.model.*
 import com.google.android.material.snackbar.Snackbar
 import com.google.maps.android.ui.IconGenerator
-import ee.taltech.iti0213.sportsapp.BuildConfig
-import ee.taltech.iti0213.sportsapp.C
-import ee.taltech.iti0213.sportsapp.R
-import ee.taltech.iti0213.sportsapp.detector.FlingDetector
-import ee.taltech.iti0213.sportsapp.service.LocationService
-import ee.taltech.iti0213.sportsapp.component.spinner.CompassMode
-import ee.taltech.iti0213.sportsapp.component.spinner.DisplayMode
-import ee.taltech.iti0213.sportsapp.component.spinner.ReplaySpinnerItems
-import ee.taltech.iti0213.sportsapp.component.spinner.RotationMode
-import ee.taltech.iti0213.sportsapp.db.ReadDatabaseTask
-import ee.taltech.iti0213.sportsapp.db.domain.TrackSummary
-import ee.taltech.iti0213.sportsapp.db.domain.User
-import ee.taltech.iti0213.sportsapp.db.repository.TrackLocationsRepository
-import ee.taltech.iti0213.sportsapp.db.repository.TrackSummaryRepository
-import ee.taltech.iti0213.sportsapp.db.repository.UserRepository
-import ee.taltech.iti0213.sportsapp.provider.FakeLocationProvider
-import ee.taltech.iti0213.sportsapp.track.TrackType
-import ee.taltech.iti0213.sportsapp.track.converters.Converter
-import ee.taltech.iti0213.sportsapp.track.pracelable.TrackData
-import ee.taltech.iti0213.sportsapp.track.pracelable.TrackSyncData
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.TrackLocation
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.WayPoint
-import ee.taltech.iti0213.sportsapp.util.filter.SimpleFilter
+import ee.taltech.kilpkonn.sportsapp.BuildConfig
+import ee.taltech.kilpkonn.sportsapp.C
+import ee.taltech.kilpkonn.sportsapp.R
+import ee.taltech.kilpkonn.sportsapp.detector.FlingDetector
+import ee.taltech.kilpkonn.sportsapp.service.LocationService
+import ee.taltech.kilpkonn.sportsapp.component.spinner.CompassMode
+import ee.taltech.kilpkonn.sportsapp.component.spinner.DisplayMode
+import ee.taltech.kilpkonn.sportsapp.component.spinner.ReplaySpinnerItems
+import ee.taltech.kilpkonn.sportsapp.component.spinner.RotationMode
+import ee.taltech.kilpkonn.sportsapp.db.ReadDatabaseTask
+import ee.taltech.kilpkonn.sportsapp.db.domain.TrackSummary
+import ee.taltech.kilpkonn.sportsapp.db.domain.User
+import ee.taltech.kilpkonn.sportsapp.db.repository.TrackLocationsRepository
+import ee.taltech.kilpkonn.sportsapp.db.repository.TrackSummaryRepository
+import ee.taltech.kilpkonn.sportsapp.db.repository.UserRepository
+import ee.taltech.kilpkonn.sportsapp.provider.FakeLocationProvider
+import ee.taltech.kilpkonn.sportsapp.track.TrackType
+import ee.taltech.kilpkonn.sportsapp.track.converters.Converter
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.TrackData
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.TrackSyncData
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.TrackLocation
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.WayPoint
+import ee.taltech.kilpkonn.sportsapp.util.filter.SimpleFilter
 import java.lang.Math.toDegrees
 import kotlin.math.min
 import kotlin.math.pow
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/activity/OverviewActivity.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/activity/OverviewActivity.kt
similarity index 86%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/activity/OverviewActivity.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/activity/OverviewActivity.kt
index d04857a..8574284 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/activity/OverviewActivity.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/activity/OverviewActivity.kt
@@ -1,20 +1,20 @@
-package ee.taltech.iti0213.sportsapp.activity
+package ee.taltech.kilpkonn.sportsapp.activity
 
 import android.os.Bundle
 import android.view.MotionEvent
 import android.view.View
 import android.widget.*
 import androidx.appcompat.app.AppCompatActivity
-import ee.taltech.iti0213.sportsapp.R
-import ee.taltech.iti0213.sportsapp.component.imageview.TrackTypeIcons
-import ee.taltech.iti0213.sportsapp.component.spinner.OverviewMode
-import ee.taltech.iti0213.sportsapp.component.spinner.adapter.OverviewTypeSpinnerAdapter
-import ee.taltech.iti0213.sportsapp.db.domain.User
-import ee.taltech.iti0213.sportsapp.db.repository.TrackSummaryRepository
-import ee.taltech.iti0213.sportsapp.db.repository.UserRepository
-import ee.taltech.iti0213.sportsapp.detector.FlingDetector
-import ee.taltech.iti0213.sportsapp.track.TrackType
-import ee.taltech.iti0213.sportsapp.track.converters.Converter
+import ee.taltech.kilpkonn.sportsapp.R
+import ee.taltech.kilpkonn.sportsapp.component.imageview.TrackTypeIcons
+import ee.taltech.kilpkonn.sportsapp.component.spinner.OverviewMode
+import ee.taltech.kilpkonn.sportsapp.component.spinner.adapter.OverviewTypeSpinnerAdapter
+import ee.taltech.kilpkonn.sportsapp.db.domain.User
+import ee.taltech.kilpkonn.sportsapp.db.repository.TrackSummaryRepository
+import ee.taltech.kilpkonn.sportsapp.db.repository.UserRepository
+import ee.taltech.kilpkonn.sportsapp.detector.FlingDetector
+import ee.taltech.kilpkonn.sportsapp.track.TrackType
+import ee.taltech.kilpkonn.sportsapp.track.converters.Converter
 
 class OverviewActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/activity/SettingsActivity.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/activity/SettingsActivity.kt
similarity index 93%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/activity/SettingsActivity.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/activity/SettingsActivity.kt
index 1076f8f..85a4d38 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/activity/SettingsActivity.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/activity/SettingsActivity.kt
@@ -1,6 +1,5 @@
-package ee.taltech.iti0213.sportsapp.activity
+package ee.taltech.kilpkonn.sportsapp.activity
 
-import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import android.view.MotionEvent
@@ -10,22 +9,19 @@ import android.widget.*
 import android.widget.SeekBar.OnSeekBarChangeListener
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.google.android.material.snackbar.Snackbar
-import ee.taltech.iti0213.sportsapp.C
-import ee.taltech.iti0213.sportsapp.R
-import ee.taltech.iti0213.sportsapp.api.controller.AccountController
-import ee.taltech.iti0213.sportsapp.api.controller.TrackSyncController
-import ee.taltech.iti0213.sportsapp.api.dto.LoginDto
-import ee.taltech.iti0213.sportsapp.api.dto.RegisterDto
-import ee.taltech.iti0213.sportsapp.component.spinner.adapter.TrackTypeSpinnerAdapter
-import ee.taltech.iti0213.sportsapp.db.domain.User
-import ee.taltech.iti0213.sportsapp.db.repository.*
-import ee.taltech.iti0213.sportsapp.detector.FlingDetector
-import ee.taltech.iti0213.sportsapp.track.Track
-import ee.taltech.iti0213.sportsapp.track.TrackType
-import ee.taltech.iti0213.sportsapp.util.HashUtils
-import ee.taltech.iti0213.sportsapp.util.TrackUtils
+import ee.taltech.kilpkonn.sportsapp.R
+import ee.taltech.kilpkonn.sportsapp.api.controller.AccountController
+import ee.taltech.kilpkonn.sportsapp.api.controller.TrackSyncController
+import ee.taltech.kilpkonn.sportsapp.api.dto.LoginDto
+import ee.taltech.kilpkonn.sportsapp.api.dto.RegisterDto
+import ee.taltech.kilpkonn.sportsapp.component.spinner.adapter.TrackTypeSpinnerAdapter
+import ee.taltech.kilpkonn.sportsapp.db.domain.User
+import ee.taltech.kilpkonn.sportsapp.db.repository.*
+import ee.taltech.kilpkonn.sportsapp.detector.FlingDetector
+import ee.taltech.kilpkonn.sportsapp.track.TrackType
+import ee.taltech.kilpkonn.sportsapp.util.HashUtils
+import ee.taltech.kilpkonn.sportsapp.util.TrackUtils
 
 class SettingsActivity : AppCompatActivity() {
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/api/WebApiHandler.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/WebApiHandler.kt
similarity index 99%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/api/WebApiHandler.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/WebApiHandler.kt
index 877e38e..807c468 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/api/WebApiHandler.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/WebApiHandler.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.api
+package ee.taltech.kilpkonn.sportsapp.api
 
 import android.content.Context
 import android.text.TextUtils
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/api/controller/AccountController.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/controller/AccountController.kt
similarity index 88%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/api/controller/AccountController.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/controller/AccountController.kt
index a5eda60..7f68cbe 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/api/controller/AccountController.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/controller/AccountController.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.api.controller
+package ee.taltech.kilpkonn.sportsapp.api.controller
 
 import android.content.Context
 import android.util.Log
@@ -7,13 +7,11 @@ import com.android.volley.Request
 import com.android.volley.Response
 import com.android.volley.toolbox.JsonObjectRequest
 import com.fasterxml.jackson.databind.ObjectMapper
-import ee.taltech.iti0213.sportsapp.api.WebApiHandler
-import ee.taltech.iti0213.sportsapp.api.dto.GpsSessionDto
-import ee.taltech.iti0213.sportsapp.api.dto.LoginDto
-import ee.taltech.iti0213.sportsapp.api.dto.LoginResponseDto
-import ee.taltech.iti0213.sportsapp.api.dto.RegisterDto
+import ee.taltech.kilpkonn.sportsapp.api.WebApiHandler
+import ee.taltech.kilpkonn.sportsapp.api.dto.LoginDto
+import ee.taltech.kilpkonn.sportsapp.api.dto.LoginResponseDto
+import ee.taltech.kilpkonn.sportsapp.api.dto.RegisterDto
 import org.json.JSONObject
-import java.nio.charset.Charset
 
 
 class AccountController private constructor(val context: Context) {
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/api/controller/TrackSyncController.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/controller/TrackSyncController.kt
similarity index 93%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/api/controller/TrackSyncController.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/controller/TrackSyncController.kt
index d9bbb17..7cdaef6 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/api/controller/TrackSyncController.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/controller/TrackSyncController.kt
@@ -1,13 +1,13 @@
-package ee.taltech.iti0213.sportsapp.api.controller
+package ee.taltech.kilpkonn.sportsapp.api.controller
 
 import android.content.Context
 import android.util.Log
 import android.widget.Toast
 import com.fasterxml.jackson.databind.ObjectMapper
-import ee.taltech.iti0213.sportsapp.api.WebApiHandler
-import ee.taltech.iti0213.sportsapp.api.dto.BulkUploadResponseDto
-import ee.taltech.iti0213.sportsapp.api.dto.GpsLocationDto
-import ee.taltech.iti0213.sportsapp.api.dto.GpsSessionDto
+import ee.taltech.kilpkonn.sportsapp.api.WebApiHandler
+import ee.taltech.kilpkonn.sportsapp.api.dto.BulkUploadResponseDto
+import ee.taltech.kilpkonn.sportsapp.api.dto.GpsLocationDto
+import ee.taltech.kilpkonn.sportsapp.api.dto.GpsSessionDto
 import org.json.JSONArray
 import org.json.JSONObject
 import java.nio.charset.Charset
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/api/dto/BulkUploadResponseDto.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/dto/BulkUploadResponseDto.kt
similarity index 86%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/api/dto/BulkUploadResponseDto.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/dto/BulkUploadResponseDto.kt
index e3e812c..5699a94 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/api/dto/BulkUploadResponseDto.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/dto/BulkUploadResponseDto.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.api.dto
+package ee.taltech.kilpkonn.sportsapp.api.dto
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/api/dto/GpsLocationDto.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/dto/GpsLocationDto.kt
similarity index 91%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/api/dto/GpsLocationDto.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/dto/GpsLocationDto.kt
index 627c8cd..c5985f8 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/api/dto/GpsLocationDto.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/dto/GpsLocationDto.kt
@@ -1,11 +1,11 @@
-package ee.taltech.iti0213.sportsapp.api.dto
+package ee.taltech.kilpkonn.sportsapp.api.dto
 
 import com.fasterxml.jackson.annotation.JsonFormat
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonProperty
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.Checkpoint
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.TrackLocation
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.WayPoint
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.Checkpoint
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.TrackLocation
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.WayPoint
 import java.util.*
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/api/dto/GpsSessionDto.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/dto/GpsSessionDto.kt
similarity index 96%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/api/dto/GpsSessionDto.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/dto/GpsSessionDto.kt
index 74b9ce7..cabcdd9 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/api/dto/GpsSessionDto.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/dto/GpsSessionDto.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.api.dto
+package ee.taltech.kilpkonn.sportsapp.api.dto
 
 import com.fasterxml.jackson.annotation.JsonFormat
 import com.fasterxml.jackson.annotation.JsonInclude
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/api/dto/LoginDto.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/dto/LoginDto.kt
similarity index 85%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/api/dto/LoginDto.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/dto/LoginDto.kt
index d574470..f70c6aa 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/api/dto/LoginDto.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/dto/LoginDto.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.api.dto
+package ee.taltech.kilpkonn.sportsapp.api.dto
 
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/api/dto/LoginResponseDto.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/dto/LoginResponseDto.kt
similarity index 86%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/api/dto/LoginResponseDto.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/dto/LoginResponseDto.kt
index 231dd20..977904f 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/api/dto/LoginResponseDto.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/dto/LoginResponseDto.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.api.dto
+package ee.taltech.kilpkonn.sportsapp.api.dto
 
 import com.fasterxml.jackson.annotation.JsonProperty
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/api/dto/RegisterDto.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/dto/RegisterDto.kt
similarity index 89%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/api/dto/RegisterDto.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/dto/RegisterDto.kt
index c45a148..75f4e3e 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/api/dto/RegisterDto.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/api/dto/RegisterDto.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.api.dto
+package ee.taltech.kilpkonn.sportsapp.api.dto
 
 import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.annotation.JsonProperty
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/imageview/TrackTypeIcons.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/imageview/TrackTypeIcons.kt
similarity index 92%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/component/imageview/TrackTypeIcons.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/imageview/TrackTypeIcons.kt
index 410a5ba..ceca841 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/imageview/TrackTypeIcons.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/imageview/TrackTypeIcons.kt
@@ -1,7 +1,7 @@
-package ee.taltech.iti0213.sportsapp.component.imageview
+package ee.taltech.kilpkonn.sportsapp.component.imageview
 
-import ee.taltech.iti0213.sportsapp.R
-import ee.taltech.iti0213.sportsapp.track.TrackType
+import ee.taltech.kilpkonn.sportsapp.R
+import ee.taltech.kilpkonn.sportsapp.track.TrackType
 
 class TrackTypeIcons {
     companion object {
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/CompassMode.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/CompassMode.kt
similarity index 80%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/CompassMode.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/CompassMode.kt
index 3295c1a..632c236 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/CompassMode.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/CompassMode.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.component.spinner
+package ee.taltech.kilpkonn.sportsapp.component.spinner
 
 class CompassMode {
     companion object {
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/DisplayMode.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/DisplayMode.kt
similarity index 78%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/DisplayMode.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/DisplayMode.kt
index 97ba0db..9b61492 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/DisplayMode.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/DisplayMode.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.component.spinner
+package ee.taltech.kilpkonn.sportsapp.component.spinner
 
 class DisplayMode {
    companion object {
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/OverviewMode.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/OverviewMode.kt
similarity index 93%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/OverviewMode.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/OverviewMode.kt
index 51d9517..5468a17 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/OverviewMode.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/OverviewMode.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.component.spinner
+package ee.taltech.kilpkonn.sportsapp.component.spinner
 
 class OverviewMode {
     companion object {
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/ReplaySpinnerItems.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/ReplaySpinnerItems.kt
similarity index 95%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/ReplaySpinnerItems.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/ReplaySpinnerItems.kt
index a558f47..b0115b7 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/ReplaySpinnerItems.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/ReplaySpinnerItems.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.component.spinner
+package ee.taltech.kilpkonn.sportsapp.component.spinner
 
 class ReplaySpinnerItems {
     companion object {
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/RotationMode.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/RotationMode.kt
similarity index 84%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/RotationMode.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/RotationMode.kt
index 673c48b..35afa10 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/RotationMode.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/RotationMode.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.component.spinner
+package ee.taltech.kilpkonn.sportsapp.component.spinner
 
 class RotationMode {
     companion object {
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/adapter/HistorySpinnerAdapter.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/adapter/HistorySpinnerAdapter.kt
similarity index 86%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/adapter/HistorySpinnerAdapter.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/adapter/HistorySpinnerAdapter.kt
index c451eca..99c0cfe 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/adapter/HistorySpinnerAdapter.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/adapter/HistorySpinnerAdapter.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.component.spinner.adapter
+package ee.taltech.kilpkonn.sportsapp.component.spinner.adapter
 
 import android.content.Context
 import android.view.View
@@ -6,8 +6,8 @@ import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.ImageView
 import android.widget.TextView
-import ee.taltech.iti0213.sportsapp.R
-import ee.taltech.iti0213.sportsapp.component.spinner.ReplaySpinnerItems
+import ee.taltech.kilpkonn.sportsapp.R
+import ee.taltech.kilpkonn.sportsapp.component.spinner.ReplaySpinnerItems
 
 
 class HistorySpinnerAdapter(context: Context) :
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/adapter/OverviewTypeSpinnerAdapter.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/adapter/OverviewTypeSpinnerAdapter.kt
similarity index 77%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/adapter/OverviewTypeSpinnerAdapter.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/adapter/OverviewTypeSpinnerAdapter.kt
index ce62c16..39b840a 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/adapter/OverviewTypeSpinnerAdapter.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/adapter/OverviewTypeSpinnerAdapter.kt
@@ -1,14 +1,12 @@
-package ee.taltech.iti0213.sportsapp.component.spinner.adapter
+package ee.taltech.kilpkonn.sportsapp.component.spinner.adapter
 
 import android.content.Context
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ArrayAdapter
-import android.widget.ImageView
 import android.widget.TextView
-import ee.taltech.iti0213.sportsapp.R
-import ee.taltech.iti0213.sportsapp.component.imageview.TrackTypeIcons
-import ee.taltech.iti0213.sportsapp.component.spinner.OverviewMode
+import ee.taltech.kilpkonn.sportsapp.R
+import ee.taltech.kilpkonn.sportsapp.component.spinner.OverviewMode
 
 
 class OverviewTypeSpinnerAdapter(context: Context) :
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/adapter/TrackTypeSpinnerAdapter.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/adapter/TrackTypeSpinnerAdapter.kt
similarity index 86%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/adapter/TrackTypeSpinnerAdapter.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/adapter/TrackTypeSpinnerAdapter.kt
index 562404c..5190d1f 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/spinner/adapter/TrackTypeSpinnerAdapter.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/spinner/adapter/TrackTypeSpinnerAdapter.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.component.spinner.adapter
+package ee.taltech.kilpkonn.sportsapp.component.spinner.adapter
 
 import android.content.Context
 import android.view.View
@@ -6,8 +6,8 @@ import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.ImageView
 import android.widget.TextView
-import ee.taltech.iti0213.sportsapp.R
-import ee.taltech.iti0213.sportsapp.component.imageview.TrackTypeIcons
+import ee.taltech.kilpkonn.sportsapp.R
+import ee.taltech.kilpkonn.sportsapp.component.imageview.TrackTypeIcons
 
 
 class TrackTypeSpinnerAdapter(context: Context) :
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/view/TrackIconImageView.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/view/TrackIconImageView.kt
similarity index 92%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/component/view/TrackIconImageView.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/view/TrackIconImageView.kt
index 8e1b023..73dd66b 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/component/view/TrackIconImageView.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/component/view/TrackIconImageView.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.component.view
+package ee.taltech.kilpkonn.sportsapp.component.view
 
 import android.animation.ArgbEvaluator
 import android.content.Context
@@ -6,8 +6,8 @@ import android.graphics.Canvas
 import android.graphics.Paint
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatImageView
-import ee.taltech.iti0213.sportsapp.component.spinner.ReplaySpinnerItems
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.TrackLocation
+import ee.taltech.kilpkonn.sportsapp.component.spinner.ReplaySpinnerItems
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.TrackLocation
 import kotlin.math.*
 
 class TrackIconImageView(context: Context,attrs: AttributeSet) : AppCompatImageView(context, attrs) {
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/DatabaseHelper.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/DatabaseHelper.kt
similarity index 99%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/db/DatabaseHelper.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/DatabaseHelper.kt
index bebccec..9e62dbc 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/DatabaseHelper.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/DatabaseHelper.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.db
+package ee.taltech.kilpkonn.sportsapp.db
 
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/ReadDatabaseTask.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/ReadDatabaseTask.kt
similarity index 91%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/db/ReadDatabaseTask.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/ReadDatabaseTask.kt
index 295c8a6..5a03897 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/ReadDatabaseTask.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/ReadDatabaseTask.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.db
+package ee.taltech.kilpkonn.sportsapp.db
 
 import android.os.AsyncTask
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/domain/OfflineSession.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/domain/OfflineSession.kt
similarity index 57%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/db/domain/OfflineSession.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/domain/OfflineSession.kt
index f9521a2..1cc3679 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/domain/OfflineSession.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/domain/OfflineSession.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.db.domain
+package ee.taltech.kilpkonn.sportsapp.db.domain
 
 class OfflineSession(
     val id: Long,
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/domain/TrackSummary.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/domain/TrackSummary.kt
similarity index 97%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/db/domain/TrackSummary.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/domain/TrackSummary.kt
index c9a5d1d..a8b3ea0 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/domain/TrackSummary.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/domain/TrackSummary.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.db.domain
+package ee.taltech.kilpkonn.sportsapp.db.domain
 
 import android.os.Parcel
 import android.os.Parcelable
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/domain/User.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/domain/User.kt
similarity index 76%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/db/domain/User.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/domain/User.kt
index c604269..4bf9729 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/domain/User.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/domain/User.kt
@@ -1,6 +1,6 @@
-package ee.taltech.iti0213.sportsapp.db.domain
+package ee.taltech.kilpkonn.sportsapp.db.domain
 
-import ee.taltech.iti0213.sportsapp.track.TrackType
+import ee.taltech.kilpkonn.sportsapp.track.TrackType
 
 class User(
     val userId: Long?,
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/CheckpointsRepository.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/CheckpointsRepository.kt
similarity index 94%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/CheckpointsRepository.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/CheckpointsRepository.kt
index a94cbe3..eb80cc5 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/CheckpointsRepository.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/CheckpointsRepository.kt
@@ -1,9 +1,9 @@
-package ee.taltech.iti0213.sportsapp.db.repository
+package ee.taltech.kilpkonn.sportsapp.db.repository
 
 import android.content.ContentValues
 import android.content.Context
-import ee.taltech.iti0213.sportsapp.db.DatabaseHelper
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.Checkpoint
+import ee.taltech.kilpkonn.sportsapp.db.DatabaseHelper
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.Checkpoint
 
 class CheckpointsRepository private constructor(context: Context): IRepository {
 
diff --git a/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/IRepository.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/IRepository.kt
new file mode 100644
index 0000000..27ec6b0
--- /dev/null
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/IRepository.kt
@@ -0,0 +1,5 @@
+package ee.taltech.kilpkonn.sportsapp.db.repository
+
+interface IRepository {
+    fun close()
+}
\ No newline at end of file
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/OfflineSessionsRepository.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/OfflineSessionsRepository.kt
similarity index 92%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/OfflineSessionsRepository.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/OfflineSessionsRepository.kt
index 06547ab..2632925 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/OfflineSessionsRepository.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/OfflineSessionsRepository.kt
@@ -1,9 +1,9 @@
-package ee.taltech.iti0213.sportsapp.db.repository
+package ee.taltech.kilpkonn.sportsapp.db.repository
 
 import android.content.ContentValues
 import android.content.Context
-import ee.taltech.iti0213.sportsapp.db.DatabaseHelper
-import ee.taltech.iti0213.sportsapp.db.domain.OfflineSession
+import ee.taltech.kilpkonn.sportsapp.db.DatabaseHelper
+import ee.taltech.kilpkonn.sportsapp.db.domain.OfflineSession
 
 class OfflineSessionsRepository private constructor(context: Context) : IRepository {
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/TrackLocationsRepository.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/TrackLocationsRepository.kt
similarity index 94%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/TrackLocationsRepository.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/TrackLocationsRepository.kt
index 2e9630a..b82371b 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/TrackLocationsRepository.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/TrackLocationsRepository.kt
@@ -1,9 +1,9 @@
-package ee.taltech.iti0213.sportsapp.db.repository
+package ee.taltech.kilpkonn.sportsapp.db.repository
 
 import android.content.ContentValues
 import android.content.Context
-import ee.taltech.iti0213.sportsapp.db.DatabaseHelper
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.TrackLocation
+import ee.taltech.kilpkonn.sportsapp.db.DatabaseHelper
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.TrackLocation
 
 class TrackLocationsRepository private constructor(context: Context): IRepository {
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/TrackSummaryRepository.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/TrackSummaryRepository.kt
similarity index 96%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/TrackSummaryRepository.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/TrackSummaryRepository.kt
index 0d62070..4695c07 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/TrackSummaryRepository.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/TrackSummaryRepository.kt
@@ -1,11 +1,11 @@
-package ee.taltech.iti0213.sportsapp.db.repository
+package ee.taltech.kilpkonn.sportsapp.db.repository
 
 import android.content.ContentValues
 import android.content.Context
-import ee.taltech.iti0213.sportsapp.db.DatabaseHelper
-import ee.taltech.iti0213.sportsapp.db.domain.TrackSummary
-import ee.taltech.iti0213.sportsapp.track.Track
-import ee.taltech.iti0213.sportsapp.track.TrackType
+import ee.taltech.kilpkonn.sportsapp.db.DatabaseHelper
+import ee.taltech.kilpkonn.sportsapp.db.domain.TrackSummary
+import ee.taltech.kilpkonn.sportsapp.track.Track
+import ee.taltech.kilpkonn.sportsapp.track.TrackType
 
 class TrackSummaryRepository private constructor(context: Context) : IRepository {
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/UserRepository.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/UserRepository.kt
similarity index 94%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/UserRepository.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/UserRepository.kt
index fb13bef..6f49be2 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/UserRepository.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/UserRepository.kt
@@ -1,10 +1,10 @@
-package ee.taltech.iti0213.sportsapp.db.repository
+package ee.taltech.kilpkonn.sportsapp.db.repository
 
 import android.content.ContentValues
 import android.content.Context
-import ee.taltech.iti0213.sportsapp.db.DatabaseHelper
-import ee.taltech.iti0213.sportsapp.db.domain.User
-import ee.taltech.iti0213.sportsapp.track.TrackType
+import ee.taltech.kilpkonn.sportsapp.db.DatabaseHelper
+import ee.taltech.kilpkonn.sportsapp.db.domain.User
+import ee.taltech.kilpkonn.sportsapp.track.TrackType
 
 class UserRepository(context: Context): IRepository {
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/WayPointsRepository.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/WayPointsRepository.kt
similarity index 92%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/WayPointsRepository.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/WayPointsRepository.kt
index a3be483..f5f0be5 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/db/repository/WayPointsRepository.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/db/repository/WayPointsRepository.kt
@@ -1,9 +1,9 @@
-package ee.taltech.iti0213.sportsapp.db.repository
+package ee.taltech.kilpkonn.sportsapp.db.repository
 
 import android.content.ContentValues
 import android.content.Context
-import ee.taltech.iti0213.sportsapp.db.DatabaseHelper
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.WayPoint
+import ee.taltech.kilpkonn.sportsapp.db.DatabaseHelper
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.WayPoint
 
 class WayPointsRepository private constructor(context: Context): IRepository {
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/detector/FlingDetector.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/detector/FlingDetector.kt
similarity index 97%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/detector/FlingDetector.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/detector/FlingDetector.kt
index ecb8c4d..22d6b2d 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/detector/FlingDetector.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/detector/FlingDetector.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.detector
+package ee.taltech.kilpkonn.sportsapp.detector
 
 import android.content.Context
 import android.util.Log
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/provider/FakeLocationProvider.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/provider/FakeLocationProvider.kt
similarity index 86%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/provider/FakeLocationProvider.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/provider/FakeLocationProvider.kt
index da61489..6c8b072 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/provider/FakeLocationProvider.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/provider/FakeLocationProvider.kt
@@ -1,8 +1,8 @@
-package ee.taltech.iti0213.sportsapp.provider
+package ee.taltech.kilpkonn.sportsapp.provider
 
 import android.location.Location
 import com.google.android.gms.maps.LocationSource
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.TrackLocation
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.TrackLocation
 
 class FakeLocationProvider: LocationSource {
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/service/LocationService.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/service/LocationService.kt
similarity index 94%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/service/LocationService.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/service/LocationService.kt
index 279a5a9..1b73aa9 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/service/LocationService.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/service/LocationService.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.service
+package ee.taltech.kilpkonn.sportsapp.service
 
 import android.app.NotificationManager
 import android.app.PendingIntent
@@ -17,23 +17,23 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.google.android.gms.location.*
-import ee.taltech.iti0213.sportsapp.C
-import ee.taltech.iti0213.sportsapp.R
-import ee.taltech.iti0213.sportsapp.api.controller.AccountController
-import ee.taltech.iti0213.sportsapp.api.controller.TrackSyncController
-import ee.taltech.iti0213.sportsapp.api.dto.GpsLocationDto
-import ee.taltech.iti0213.sportsapp.api.dto.GpsSessionDto
-import ee.taltech.iti0213.sportsapp.api.dto.LoginDto
-import ee.taltech.iti0213.sportsapp.db.domain.User
-import ee.taltech.iti0213.sportsapp.db.repository.*
-import ee.taltech.iti0213.sportsapp.track.Track
-import ee.taltech.iti0213.sportsapp.track.TrackType
-import ee.taltech.iti0213.sportsapp.track.pracelable.TrackData
-import ee.taltech.iti0213.sportsapp.track.converters.Converter
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.TrackLocation
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.WayPoint
-import ee.taltech.iti0213.sportsapp.util.TrackUtils
-import ee.taltech.iti0213.sportsapp.util.filter.KalmanTrackLocationFilter
+import ee.taltech.kilpkonn.sportsapp.C
+import ee.taltech.kilpkonn.sportsapp.R
+import ee.taltech.kilpkonn.sportsapp.api.controller.AccountController
+import ee.taltech.kilpkonn.sportsapp.api.controller.TrackSyncController
+import ee.taltech.kilpkonn.sportsapp.api.dto.GpsLocationDto
+import ee.taltech.kilpkonn.sportsapp.api.dto.GpsSessionDto
+import ee.taltech.kilpkonn.sportsapp.api.dto.LoginDto
+import ee.taltech.kilpkonn.sportsapp.db.domain.User
+import ee.taltech.kilpkonn.sportsapp.db.repository.*
+import ee.taltech.kilpkonn.sportsapp.track.Track
+import ee.taltech.kilpkonn.sportsapp.track.TrackType
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.TrackData
+import ee.taltech.kilpkonn.sportsapp.track.converters.Converter
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.TrackLocation
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.WayPoint
+import ee.taltech.kilpkonn.sportsapp.util.TrackUtils
+import ee.taltech.kilpkonn.sportsapp.util.filter.KalmanTrackLocationFilter
 import java.util.*
 
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/track/Track.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/Track.kt
similarity index 90%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/track/Track.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/Track.kt
index ef3cc24..ed7035c 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/track/Track.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/Track.kt
@@ -1,15 +1,15 @@
-package ee.taltech.iti0213.sportsapp.track
-
-import ee.taltech.iti0213.sportsapp.track.pracelable.DetailedTrackData
-import ee.taltech.iti0213.sportsapp.track.pracelable.TrackData
-import ee.taltech.iti0213.sportsapp.track.pracelable.TrackSyncData
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.Checkpoint
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.TrackLocation
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.WayPoint
-import ee.taltech.iti0213.sportsapp.util.TrackUtils
-import ee.taltech.iti0213.sportsapp.util.datatype.Vector2D
-import ee.taltech.iti0213.sportsapp.util.filter.SimpleFilter
-import ee.taltech.iti0213.sportsapp.util.filter.SimpleFilter2D
+package ee.taltech.kilpkonn.sportsapp.track
+
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.DetailedTrackData
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.TrackData
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.TrackSyncData
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.Checkpoint
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.TrackLocation
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.WayPoint
+import ee.taltech.kilpkonn.sportsapp.util.TrackUtils
+import ee.taltech.kilpkonn.sportsapp.util.datatype.Vector2D
+import ee.taltech.kilpkonn.sportsapp.util.filter.SimpleFilter
+import ee.taltech.kilpkonn.sportsapp.util.filter.SimpleFilter2D
 import java.util.*
 import kotlin.math.PI
 import kotlin.math.cos
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/track/TrackType.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/TrackType.kt
similarity index 86%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/track/TrackType.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/TrackType.kt
index 22fcd4c..5ddfbb2 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/track/TrackType.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/TrackType.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.track
+package ee.taltech.kilpkonn.sportsapp.track
 
 enum class TrackType(val value: Int) {
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/track/converters/Converter.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/converters/Converter.kt
similarity index 94%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/track/converters/Converter.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/converters/Converter.kt
index f2a4130..b406187 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/track/converters/Converter.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/converters/Converter.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.track.converters
+package ee.taltech.kilpkonn.sportsapp.track.converters
 
 import kotlin.math.abs
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/track/pracelable/DetailedTrackData.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/pracelable/DetailedTrackData.kt
similarity index 96%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/track/pracelable/DetailedTrackData.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/pracelable/DetailedTrackData.kt
index 258e064..e80de9f 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/track/pracelable/DetailedTrackData.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/pracelable/DetailedTrackData.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.track.pracelable
+package ee.taltech.kilpkonn.sportsapp.track.pracelable
 
 import android.os.Parcel
 import android.os.Parcelable
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/track/pracelable/TrackData.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/pracelable/TrackData.kt
similarity index 97%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/track/pracelable/TrackData.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/pracelable/TrackData.kt
index 2b9821c..40b85ff 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/track/pracelable/TrackData.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/pracelable/TrackData.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.track.pracelable
+package ee.taltech.kilpkonn.sportsapp.track.pracelable
 
 import android.os.Parcel
 import android.os.Parcelable
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/track/pracelable/TrackSyncData.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/pracelable/TrackSyncData.kt
similarity index 80%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/track/pracelable/TrackSyncData.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/pracelable/TrackSyncData.kt
index 6a920f2..79a150a 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/track/pracelable/TrackSyncData.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/pracelable/TrackSyncData.kt
@@ -1,10 +1,10 @@
-package ee.taltech.iti0213.sportsapp.track.pracelable
+package ee.taltech.kilpkonn.sportsapp.track.pracelable
 
 import android.os.Parcel
 import android.os.Parcelable
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.Checkpoint
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.TrackLocation
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.WayPoint
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.Checkpoint
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.TrackLocation
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.WayPoint
 
 class TrackSyncData(val track: List<TrackLocation>, val wayPoints: List<WayPoint>, val checkpoints: List<Checkpoint>, val pauses: List<Int>): Parcelable {
     constructor(parcel: Parcel) : this(
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/track/pracelable/loaction/Checkpoint.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/pracelable/loaction/Checkpoint.kt
similarity index 98%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/track/pracelable/loaction/Checkpoint.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/pracelable/loaction/Checkpoint.kt
index a5bc8f1..3f26eb3 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/track/pracelable/loaction/Checkpoint.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/pracelable/loaction/Checkpoint.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.track.pracelable.loaction
+package ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction
 
 import android.os.Parcel
 import android.os.Parcelable
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/track/pracelable/loaction/TrackLocation.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/pracelable/loaction/TrackLocation.kt
similarity index 97%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/track/pracelable/loaction/TrackLocation.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/pracelable/loaction/TrackLocation.kt
index 91265c7..668af6d 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/track/pracelable/loaction/TrackLocation.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/pracelable/loaction/TrackLocation.kt
@@ -1,11 +1,10 @@
-package ee.taltech.iti0213.sportsapp.track.pracelable.loaction
+package ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction
 
 import android.location.Location
 import android.os.Build
 import android.os.Parcel
 import android.os.Parcelable
 import java.io.Serializable
-import java.sql.Timestamp
 
 class TrackLocation(
     val latitude: Double,
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/track/pracelable/loaction/WayPoint.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/pracelable/loaction/WayPoint.kt
similarity index 96%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/track/pracelable/loaction/WayPoint.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/pracelable/loaction/WayPoint.kt
index 9be49da..49818ae 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/track/pracelable/loaction/WayPoint.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/track/pracelable/loaction/WayPoint.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.track.pracelable.loaction
+package ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction
 
 import android.os.Parcel
 import android.os.Parcelable
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/util/HashUtils.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/HashUtils.kt
similarity index 95%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/util/HashUtils.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/HashUtils.kt
index 71dcfe4..903582d 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/util/HashUtils.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/HashUtils.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.util
+package ee.taltech.kilpkonn.sportsapp.util
 
 import java.security.MessageDigest
 import java.util.*
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/util/TrackUtils.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/TrackUtils.kt
similarity index 91%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/util/TrackUtils.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/TrackUtils.kt
index 5350a1e..03f284c 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/util/TrackUtils.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/TrackUtils.kt
@@ -1,17 +1,17 @@
-package ee.taltech.iti0213.sportsapp.util
+package ee.taltech.kilpkonn.sportsapp.util
 
 import android.content.Context
 import android.widget.Toast
-import ee.taltech.iti0213.sportsapp.api.controller.TrackSyncController
-import ee.taltech.iti0213.sportsapp.api.dto.GpsLocationDto
-import ee.taltech.iti0213.sportsapp.api.dto.GpsSessionDto
-import ee.taltech.iti0213.sportsapp.component.imageview.TrackTypeIcons
-import ee.taltech.iti0213.sportsapp.db.repository.*
-import ee.taltech.iti0213.sportsapp.track.Track
-import ee.taltech.iti0213.sportsapp.track.TrackType
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.Checkpoint
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.TrackLocation
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.WayPoint
+import ee.taltech.kilpkonn.sportsapp.api.controller.TrackSyncController
+import ee.taltech.kilpkonn.sportsapp.api.dto.GpsLocationDto
+import ee.taltech.kilpkonn.sportsapp.api.dto.GpsSessionDto
+import ee.taltech.kilpkonn.sportsapp.component.imageview.TrackTypeIcons
+import ee.taltech.kilpkonn.sportsapp.db.repository.*
+import ee.taltech.kilpkonn.sportsapp.track.Track
+import ee.taltech.kilpkonn.sportsapp.track.TrackType
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.Checkpoint
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.TrackLocation
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.WayPoint
 import io.jenetics.jpx.GPX
 
 import java.text.SimpleDateFormat
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/util/datatype/Vector2D.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/datatype/Vector2D.kt
similarity index 88%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/util/datatype/Vector2D.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/datatype/Vector2D.kt
index 3773f69..b4ab46d 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/util/datatype/Vector2D.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/datatype/Vector2D.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.util.datatype
+package ee.taltech.kilpkonn.sportsapp.util.datatype
 
 import kotlin.math.sqrt
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/util/filter/IFilter.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/filter/IFilter.kt
similarity index 52%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/util/filter/IFilter.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/filter/IFilter.kt
index 2eccc2d..4d1044a 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/util/filter/IFilter.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/filter/IFilter.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.util.filter
+package ee.taltech.kilpkonn.sportsapp.util.filter
 
 interface IFilter<T> {
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/util/filter/KalmanTrackLocationFilter.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/filter/KalmanTrackLocationFilter.kt
similarity index 93%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/util/filter/KalmanTrackLocationFilter.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/filter/KalmanTrackLocationFilter.kt
index af10606..8703317 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/util/filter/KalmanTrackLocationFilter.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/filter/KalmanTrackLocationFilter.kt
@@ -1,6 +1,6 @@
-package ee.taltech.iti0213.sportsapp.util.filter
+package ee.taltech.kilpkonn.sportsapp.util.filter
 
-import ee.taltech.iti0213.sportsapp.track.pracelable.loaction.TrackLocation
+import ee.taltech.kilpkonn.sportsapp.track.pracelable.loaction.TrackLocation
 
 
 class KalmanTrackLocationFilter(private val qMetersPerSecond: Double) : IFilter<TrackLocation> {
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/util/filter/SimpleFilter.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/filter/SimpleFilter.kt
similarity index 88%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/util/filter/SimpleFilter.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/filter/SimpleFilter.kt
index 33c8b65..482ef01 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/util/filter/SimpleFilter.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/filter/SimpleFilter.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.util.filter
+package ee.taltech.kilpkonn.sportsapp.util.filter
 
 class SimpleFilter(val length: Int): IFilter<Double> {
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/util/filter/SimpleFilter2D.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/filter/SimpleFilter2D.kt
similarity index 80%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/util/filter/SimpleFilter2D.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/filter/SimpleFilter2D.kt
index f59dcec..baa691f 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/util/filter/SimpleFilter2D.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/filter/SimpleFilter2D.kt
@@ -1,6 +1,6 @@
-package ee.taltech.iti0213.sportsapp.util.filter
+package ee.taltech.kilpkonn.sportsapp.util.filter
 
-import ee.taltech.iti0213.sportsapp.util.datatype.Vector2D
+import ee.taltech.kilpkonn.sportsapp.util.datatype.Vector2D
 
 class SimpleFilter2D(private val length: Int): IFilter<Vector2D> {
 
diff --git a/app/src/main/java/ee/taltech/iti0213/sportsapp/util/serializer/TrackSerializer.kt b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/serializer/TrackSerializer.kt
similarity index 96%
rename from app/src/main/java/ee/taltech/iti0213/sportsapp/util/serializer/TrackSerializer.kt
rename to app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/serializer/TrackSerializer.kt
index 1053fb4..3ad4129 100644
--- a/app/src/main/java/ee/taltech/iti0213/sportsapp/util/serializer/TrackSerializer.kt
+++ b/app/src/main/java/ee/taltech/kilpkonn/sportsapp/util/serializer/TrackSerializer.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp.util.serializer
+package ee.taltech.kilpkonn.sportsapp.util.serializer
 
 import android.content.Context
 import android.os.Environment
diff --git a/app/src/main/res/layout/track_history_item.xml b/app/src/main/res/layout/track_history_item.xml
index b70068a..447e3ea 100644
--- a/app/src/main/res/layout/track_history_item.xml
+++ b/app/src/main/res/layout/track_history_item.xml
@@ -15,7 +15,7 @@
         android:background="@drawable/rounded_corners">
 
 
-        <ee.taltech.iti0213.sportsapp.component.view.TrackIconImageView
+        <ee.taltech.kilpkonn.sportsapp.component.view.TrackIconImageView
             android:id="@+id/track_image"
             android:layout_width="100dp"
             android:layout_height="100dp"
diff --git a/app/src/test/java/ee/taltech/iti0213/sportsapp/ExampleUnitTest.kt b/app/src/test/java/ee/taltech/kilpkonn/sportsapp/ExampleUnitTest.kt
similarity index 89%
rename from app/src/test/java/ee/taltech/iti0213/sportsapp/ExampleUnitTest.kt
rename to app/src/test/java/ee/taltech/kilpkonn/sportsapp/ExampleUnitTest.kt
index 23ab680..54d243c 100644
--- a/app/src/test/java/ee/taltech/iti0213/sportsapp/ExampleUnitTest.kt
+++ b/app/src/test/java/ee/taltech/kilpkonn/sportsapp/ExampleUnitTest.kt
@@ -1,4 +1,4 @@
-package ee.taltech.iti0213.sportsapp
+package ee.taltech.kilpkonn.sportsapp
 
 import org.junit.Test