diff --git a/src/app.controller.spec.ts b/src/app.controller.spec.ts
deleted file mode 100644
index d22f389..0000000
--- a/src/app.controller.spec.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { AppController } from './app.controller';
-import { AppService } from './app.service';
-
-describe('AppController', () => {
-  let appController: AppController;
-
-  beforeEach(async () => {
-    const app: TestingModule = await Test.createTestingModule({
-      controllers: [AppController],
-      providers: [AppService],
-    }).compile();
-
-    appController = app.get<AppController>(AppController);
-  });
-
-  describe('root', () => {
-    it('should return "Hello World!"', () => {
-      expect(appController.getHello()).toBe('Hello World!');
-    });
-  });
-});
diff --git a/src/app.controller.ts b/src/app.controller.ts
deleted file mode 100644
index cce879e..0000000
--- a/src/app.controller.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Controller, Get } from '@nestjs/common';
-import { AppService } from './app.service';
-
-@Controller()
-export class AppController {
-  constructor(private readonly appService: AppService) {}
-
-  @Get()
-  getHello(): string {
-    return this.appService.getHello();
-  }
-}
diff --git a/src/app.module.ts b/src/app.module.ts
index 8662803..5e64a1c 100644
--- a/src/app.module.ts
+++ b/src/app.module.ts
@@ -1,10 +1,10 @@
 import { Module } from '@nestjs/common';
-import { AppController } from './app.controller';
-import { AppService } from './app.service';
+import { HelloWorldController } from './hello-world/controller';
+import { HelloWorldService } from './hello-world/service';
 
 @Module({
   imports: [],
-  controllers: [AppController],
-  providers: [AppService],
+  controllers: [HelloWorldController],
+  providers: [HelloWorldService],
 })
 export class AppModule {}
diff --git a/src/hello-world/controller.spec.ts b/src/hello-world/controller.spec.ts
new file mode 100644
index 0000000..def410e
--- /dev/null
+++ b/src/hello-world/controller.spec.ts
@@ -0,0 +1,22 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { HelloWorldController } from './controller';
+import { HelloWorldService } from './service';
+
+describe('HelloWorldController', () => {
+  let helloWorldController: HelloWorldController;
+
+  beforeEach(async () => {
+    const app: TestingModule = await Test.createTestingModule({
+      controllers: [HelloWorldController],
+      providers: [HelloWorldService],
+    }).compile();
+
+    helloWorldController = app.get<HelloWorldController>(HelloWorldController);
+  });
+
+  describe('root', () => {
+    it('should return "Hello World!"', () => {
+      expect(helloWorldController.getHello()).toBe('Hello World!');
+    });
+  });
+});
diff --git a/src/hello-world/controller.ts b/src/hello-world/controller.ts
new file mode 100644
index 0000000..d99ae3e
--- /dev/null
+++ b/src/hello-world/controller.ts
@@ -0,0 +1,12 @@
+import { Controller, Get } from '@nestjs/common';
+import { HelloWorldService } from './service';
+
+@Controller('hello-world')
+export class HelloWorldController {
+  constructor(private readonly helloWorldService: HelloWorldService) {}
+
+  @Get()
+  getHello(): string {
+    return this.helloWorldService.getHello();
+  }
+}
diff --git a/src/app.service.ts b/src/hello-world/service.ts
similarity index 77%
rename from src/app.service.ts
rename to src/hello-world/service.ts
index 927d7cc..d4d1ed6 100644
--- a/src/app.service.ts
+++ b/src/hello-world/service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 
 @Injectable()
-export class AppService {
+export class HelloWorldService {
   getHello(): string {
     return 'Hello World!';
   }
diff --git a/test/app.e2e-spec.ts b/test/app.e2e-spec.ts
index 50cda62..b69ae6e 100644
--- a/test/app.e2e-spec.ts
+++ b/test/app.e2e-spec.ts
@@ -15,9 +15,9 @@ describe('AppController (e2e)', () => {
     await app.init();
   });
 
-  it('/ (GET)', () => {
+  it('/hello-world (GET)', () => {
     return request(app.getHttpServer())
-      .get('/')
+      .get('/hello-world')
       .expect(200)
       .expect('Hello World!');
   });