diff --git a/src/main/Application.kt b/src/main/App.kt
similarity index 97%
rename from src/main/Application.kt
rename to src/main/App.kt
index 774d13a..d043ea4 100644
--- a/src/main/Application.kt
+++ b/src/main/App.kt
@@ -7,7 +7,6 @@ import io.ktor.server.plugins.contentnegotiation.*
 import io.ktor.server.request.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
-import java.io.ByteArrayInputStream
 
 fun main(args: Array<String>): Unit = io.ktor.server.netty.EngineMain.main(args)
 
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
index 5a6bfd2..534f8c7 100644
--- a/src/main/resources/application.conf
+++ b/src/main/resources/application.conf
@@ -4,6 +4,6 @@ ktor {
         port = ${?PORT}
     }
     application {
-        modules = [ com.github.statnett.loadflowservice.ApplicationKt.module ]
+        modules = [ com.github.statnett.loadflowservice.AppKt.module ]
     }
 }
\ No newline at end of file
diff --git a/src/test/ApplicationTest.kt b/src/test/AppTest.kt
similarity index 100%
rename from src/test/ApplicationTest.kt
rename to src/test/AppTest.kt