diff --git a/backend/app/src/main/kotlin/io/tolgee/InitialUserCreatorRunner.kt b/backend/app/src/main/kotlin/io/tolgee/commandLineRunners/InitialUserCreatorCommandLineRunner.kt
similarity index 94%
rename from backend/app/src/main/kotlin/io/tolgee/InitialUserCreatorRunner.kt
rename to backend/app/src/main/kotlin/io/tolgee/commandLineRunners/InitialUserCreatorCommandLineRunner.kt
index 36bb248164..844dbce975 100644
--- a/backend/app/src/main/kotlin/io/tolgee/InitialUserCreatorRunner.kt
+++ b/backend/app/src/main/kotlin/io/tolgee/commandLineRunners/InitialUserCreatorCommandLineRunner.kt
@@ -1,4 +1,4 @@
-package io.tolgee
+package io.tolgee.commandLineRunners
 
 import io.tolgee.configuration.tolgee.TolgeeProperties
 import io.tolgee.dtos.request.auth.SignUpDto
@@ -11,7 +11,7 @@ import org.springframework.context.event.ContextClosedEvent
 import org.springframework.stereotype.Component
 
 @Component
-class InitialUserCreatorRunner(
+class InitialUserCreatorCommandLineRunner(
   private val properties: TolgeeProperties,
   private val userAccountService: UserAccountService,
   private val initialPasswordManager: InitialPasswordManager
diff --git a/backend/app/src/main/kotlin/io/tolgee/MigrationJobsCommandLineRunner.kt b/backend/app/src/main/kotlin/io/tolgee/commandLineRunners/MigrationJobsCommandLineRunner.kt
similarity index 94%
rename from backend/app/src/main/kotlin/io/tolgee/MigrationJobsCommandLineRunner.kt
rename to backend/app/src/main/kotlin/io/tolgee/commandLineRunners/MigrationJobsCommandLineRunner.kt
index 12faaa858b..0bcc083ba3 100644
--- a/backend/app/src/main/kotlin/io/tolgee/MigrationJobsCommandLineRunner.kt
+++ b/backend/app/src/main/kotlin/io/tolgee/commandLineRunners/MigrationJobsCommandLineRunner.kt
@@ -1,4 +1,4 @@
-package io.tolgee
+package io.tolgee.commandLineRunners
 
 import io.tolgee.jobs.migration.translationStats.TranslationsStatsUpdateJobRunner
 import org.springframework.boot.CommandLineRunner
diff --git a/backend/app/src/main/kotlin/io/tolgee/SocketIoServerCommandLineRunner.kt b/backend/app/src/main/kotlin/io/tolgee/commandLineRunners/SocketIoServerCommandLineRunner.kt
similarity index 96%
rename from backend/app/src/main/kotlin/io/tolgee/SocketIoServerCommandLineRunner.kt
rename to backend/app/src/main/kotlin/io/tolgee/commandLineRunners/SocketIoServerCommandLineRunner.kt
index a4e4f961ea..e4e5583884 100644
--- a/backend/app/src/main/kotlin/io/tolgee/SocketIoServerCommandLineRunner.kt
+++ b/backend/app/src/main/kotlin/io/tolgee/commandLineRunners/SocketIoServerCommandLineRunner.kt
@@ -1,4 +1,4 @@
-package io.tolgee
+package io.tolgee.commandLineRunners
 
 import com.corundumstudio.socketio.SocketIOServer
 import io.tolgee.configuration.tolgee.TolgeeProperties
diff --git a/backend/app/src/main/kotlin/io/tolgee/commandLineRunners/StartupImportCommandLineRunner.kt b/backend/app/src/main/kotlin/io/tolgee/commandLineRunners/StartupImportCommandLineRunner.kt
new file mode 100644
index 0000000000..63167faa05
--- /dev/null
+++ b/backend/app/src/main/kotlin/io/tolgee/commandLineRunners/StartupImportCommandLineRunner.kt
@@ -0,0 +1,23 @@
+package io.tolgee.commandLineRunners
+
+import io.tolgee.configuration.tolgee.TolgeeProperties
+import io.tolgee.service.StartupImportService
+import org.springframework.boot.CommandLineRunner
+import org.springframework.context.ApplicationListener
+import org.springframework.context.event.ContextClosedEvent
+import org.springframework.stereotype.Component
+
+@Component
+class StartupImportCommandLineRunner(
+  val tolgeeProperties: TolgeeProperties,
+  val startupImportService: StartupImportService
+) :
+  CommandLineRunner, ApplicationListener<ContextClosedEvent> {
+  override fun run(vararg args: String) {
+    startupImportService.importFiles()
+  }
+
+  override fun onApplicationEvent(event: ContextClosedEvent) {
+    // we don't need to do anything on context close
+  }
+}
diff --git a/backend/app/src/test/kotlin/io/tolgee/StartupImportCommandLineRunnerTest.kt b/backend/app/src/test/kotlin/io/tolgee/StartupImportCommandLineRunnerTest.kt
index d4816d8f1f..6cd583859f 100644
--- a/backend/app/src/test/kotlin/io/tolgee/StartupImportCommandLineRunnerTest.kt
+++ b/backend/app/src/test/kotlin/io/tolgee/StartupImportCommandLineRunnerTest.kt
@@ -4,6 +4,7 @@
 
 package io.tolgee
 
+import io.tolgee.commandLineRunners.StartupImportCommandLineRunner
 import io.tolgee.configuration.tolgee.ImportProperties
 import io.tolgee.configuration.tolgee.TolgeeProperties
 import io.tolgee.testing.assertions.Assertions.assertThat
@@ -28,7 +29,7 @@ class StartupImportCommandLineRunnerTest : AbstractSpringTest() {
   override lateinit var tolgeeProperties: TolgeeProperties
 
   @Autowired
-  lateinit var startupImportCommandLineRunner: MigrationJobsCommandLineRunner
+  lateinit var startupImportCommandLineRunner: StartupImportCommandLineRunner
 
   @BeforeAll
   fun setup() {
diff --git a/backend/app/src/test/kotlin/io/tolgee/initial_user_creation/CreateEnabledTest.kt b/backend/app/src/test/kotlin/io/tolgee/initial_user_creation/CreateEnabledTest.kt
index db1ecbffd3..b0c7f5a2c0 100644
--- a/backend/app/src/test/kotlin/io/tolgee/initial_user_creation/CreateEnabledTest.kt
+++ b/backend/app/src/test/kotlin/io/tolgee/initial_user_creation/CreateEnabledTest.kt
@@ -6,7 +6,7 @@ package io.tolgee.initial_user_creation
 
 import io.tolgee.Application
 import io.tolgee.CleanDbBeforeClass
-import io.tolgee.InitialUserCreatorRunner
+import io.tolgee.commandLineRunners.InitialUserCreatorCommandLineRunner
 import io.tolgee.configuration.tolgee.TolgeeProperties
 import io.tolgee.service.UserAccountService
 import io.tolgee.testing.AbstractTransactionalTest
@@ -44,11 +44,11 @@ class CreateEnabledTest : AbstractTransactionalTest() {
   private val passwordFile = File("./build/create-enabled-test-data/initial.pwd")
 
   @Autowired
-  lateinit var initialUserCreatorRunner: InitialUserCreatorRunner
+  lateinit var initialUserCreatorCommandLineRunner: InitialUserCreatorCommandLineRunner
 
   @BeforeAll
   fun callTheRunner() {
-    initialUserCreatorRunner.run()
+    initialUserCreatorCommandLineRunner.run()
   }
 
   @Test