diff --git a/devops-service/lib/executors/server_executor.rb b/devops-service/lib/executors/server_executor.rb
index 1ea9b3a..15fadd7 100644
--- a/devops-service/lib/executors/server_executor.rb
+++ b/devops-service/lib/executors/server_executor.rb
@@ -1,9 +1,9 @@
 require "lib/knife/knife_factory"
-require "lib/executors/expiration_scheduler"
 require "lib/puts_and_flush"
 require "hooks"
 require 'net/ssh'
-require_relative 'server_operation_result'
+require_relative "server_executor/expiration_scheduler"
+require_relative 'server_executor/server_operation_result'
 
 module Devops
   module Executor
diff --git a/devops-service/lib/executors/expiration_scheduler.rb b/devops-service/lib/executors/server_executor/expiration_scheduler.rb
similarity index 100%
rename from devops-service/lib/executors/expiration_scheduler.rb
rename to devops-service/lib/executors/server_executor/expiration_scheduler.rb
diff --git a/devops-service/lib/executors/server_operation_result.rb b/devops-service/lib/executors/server_executor/server_operation_result.rb
similarity index 100%
rename from devops-service/lib/executors/server_operation_result.rb
rename to devops-service/lib/executors/server_executor/server_operation_result.rb
diff --git a/devops-service/spec/executors/expiration_scheduler_spec.rb b/devops-service/spec/executors/expiration_scheduler_spec.rb
index c3882aa..a0daf69 100644
--- a/devops-service/spec/executors/expiration_scheduler_spec.rb
+++ b/devops-service/spec/executors/expiration_scheduler_spec.rb
@@ -1,4 +1,4 @@
-require 'lib/executors/expiration_scheduler'
+require 'lib/executors/server_executor/expiration_scheduler'
 
 RSpec.describe Devops::Executor::ExpirationScheduler do
   let(:server) { build(:server) }