diff --git a/lib/train-k8s-container.rb b/lib/train-k8s-container.rb
index 3a67ecf..06dd2e6 100644
--- a/lib/train-k8s-container.rb
+++ b/lib/train-k8s-container.rb
@@ -1,16 +1,15 @@
 # frozen_string_literal: true
+libdir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 require_relative "train-k8s-container/version"
-#require_relative "train-k8s-container/platform"
 require_relative "train-k8s-container/connection"
 require_relative "train-k8s-container/transport"
 require_relative "train-k8s-container/kubectl_exec_client"
 
-# module Train
-#   module K8s
-#     module Container
-#       class ConnectionError < StandardError
-#       end
+# module TrainPlugins
+#   module K8sContainer
+#     class ConnectionError < StandardError
 #       # Your code goes here...
 #     end
 #   end
diff --git a/lib/train-k8s-container/connection.rb b/lib/train-k8s-container/connection.rb
index 29f6a66..7672fac 100644
--- a/lib/train-k8s-container/connection.rb
+++ b/lib/train-k8s-container/connection.rb
@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 require "train"
-require_relative "platform"
-
 require "train/plugins"
-#require "train/file/remote/linux"
+require "train/file/remote/linux"
 module TrainPlugins
   module K8sContainer
     class Connection < Train::Plugins::Transport::BaseConnection
-      #include TrainPlugins::K8sContainer::Platform
       include Train::Platforms::Common
-      #include_options Train::Extras::CommandWrapper
 
       # URI format: k8s-container://<namespace>/<pod>/<container_name>
       # @example k8s-container://default/shell-demo/nginx
@@ -25,7 +21,7 @@ def initialize(options)
         @pod = options[:pod] || uri_path&.split("/")&.first
         @container_name = options[:container_name] || uri_path&.split("/")&.last
         host = (!options[:host].nil? && !options[:host].empty?) ? options[:host] : nil
-        @namespace = options[:namespace] || host || Train::K8s::Container::KubectlExecClient::DEFAULT_NAMESPACE
+        @namespace = options[:namespace] || host || TrainPlugins::K8sContainer::KubectlExecClient::DEFAULT_NAMESPACE
         validate_parameters
       end
 
@@ -34,7 +30,6 @@ def uri
       end
 
       def platform
-        require 'byebug'; byebug
         @platform ||= Train::Platforms::Detect.scan(self)
       end
 
@@ -42,7 +37,6 @@ def platform
 
       attr_reader :pod, :container_name, :namespace
 
-
       def run_command_via_connection(cmd, &_data_handler)
         KubectlExecClient.new(pod: pod, namespace: namespace, container_name: container_name).execute(cmd)
       end
@@ -53,7 +47,7 @@ def validate_parameters
       end
 
       def file_via_connection(path, *_args)
-        #::Train::File::Remote::Linux.new(self, path)
+        ::Train::File::Remote::Linux.new(self, path)
       end
     end
   end
diff --git a/lib/train-k8s-container/kubectl_exec_client.rb b/lib/train-k8s-container/kubectl_exec_client.rb
index 3054656..df67e69 100644
--- a/lib/train-k8s-container/kubectl_exec_client.rb
+++ b/lib/train-k8s-container/kubectl_exec_client.rb
@@ -42,6 +42,6 @@ def build_instruction(command)
           arr << command
         end.join("\s")
       end
-   end
+    end
   end
 end
diff --git a/lib/train-k8s-container/platform.rb b/lib/train-k8s-container/platform.rb
deleted file mode 100644
index 452c75f..0000000
--- a/lib/train-k8s-container/platform.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-module TrainPlugins::K8sContainer
-  # Since we're mixing in the platform detection facility into Connection,
-  # this has to come in as a Module.
-  module Platform
-    # The method `platform` is called when platform detection is
-    # about to be performed.  Train core defines a sophisticated
-    # system for platform detection, but for most plugins, you'll
-    # only ever run on the special platform for which you are targeting.
-    def platform
-      Train::Platforms.name("os").in_family("unix")
-      #@force_platform!("os", release: TrainPlugins::K8sContainer::VERSION)
-    end
-  end
-end
\ No newline at end of file
diff --git a/lib/train-k8s-container/transport.rb b/lib/train-k8s-container/transport.rb
index 2ea5cc1..3c7eec7 100644
--- a/lib/train-k8s-container/transport.rb
+++ b/lib/train-k8s-container/transport.rb
@@ -2,16 +2,11 @@
 require "train"
 require "train/plugins"
 
-
-
 module TrainPlugins
   module K8sContainer
     class Transport < Train.plugin(1)
       require_relative "connection"
 
-      #name Train::K8s::Container::Platform::PLATFORM_NAME
-      #include_options Train::Extras::CommandWrapper
-      
       name "k8s-container"
 
       option :kubeconfig, default: ENV["KUBECONFIG"] || "~/.kube/config"
@@ -19,28 +14,12 @@ class Transport < Train.plugin(1)
       option :container_name, default: nil
       option :namespace, default: nil
 
-
       def connection(state = nil, &block)
         opts = merge_options(@options, state || {})
-        #validate_options(opts)
-        #conn_opts = connection_options(opts)
-
-        # if @connection && @connection_options == conn_opts
-        #   reuse_connection(&block)
-        # else
         create_new_connection(opts, &block)
-        # end
       end
-      # def connection(_instance_opts = nil)
-      #   @connection ||= TrainPlugins::K8sContainer::Connection.new(@options)
-      # end
 
       def create_new_connection(options, &block)
-        # if @connection
-        #   logger.debug("[WinRM] shutting previous connection #{@connection}")
-        #   @connection.close
-        # end
-
         @connection_options = options
         @connection = Connection.new(options, &block)
       end
diff --git a/spec/container_spec.rb b/spec/container_spec.rb
new file mode 100644
index 0000000..ff642d6
--- /dev/null
+++ b/spec/container_spec.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+require_relative "spec_helper"
+
+RSpec.describe TrainPlugins::K8sContainer do
+  it "has a version number" do
+    expect(TrainPlugins::K8sContainer::VERSION).not_to be nil
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ff41e7d..79e7292 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,8 +1,4 @@
 # frozen_string_literal: true
-
-require "train"
-require "train-k8s-container"
-
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure
   config.example_status_persistence_file_path = ".rspec_status"
diff --git a/spec/train/k8s/container/connection_spec.rb b/spec/train-k8s-container/connection_spec.rb
similarity index 67%
rename from spec/train/k8s/container/connection_spec.rb
rename to spec/train-k8s-container/connection_spec.rb
index 7591c98..70175a7 100644
--- a/spec/train/k8s/container/connection_spec.rb
+++ b/spec/train-k8s-container/connection_spec.rb
@@ -1,9 +1,10 @@
 # frozen_string_literal: true
-require_relative "../../../spec_helper"
+require_relative "../spec_helper"
+require "train-k8s-container/connection"
 
-RSpec.describe Train::K8s::Container::Connection do
+RSpec.describe TrainPlugins::K8sContainer::Connection do
   let(:options) { { pod: "shell-demo", container_name: "nginx", namespace: "default" } }
-  let(:kube_client) { double(Train::K8s::Container::KubectlExecClient) }
+  let(:kube_client) { double(TrainPlugins::K8sContainer::KubectlExecClient) }
   let(:shell_op) { Train::Extras::CommandResult.new(stdout, stderr, exitstatus) }
 
   subject { described_class.new(options) }
@@ -11,7 +12,7 @@
   let(:stderr) { "" }
   let(:exitstatus) { 0 }
   before do
-    allow(Train::K8s::Container::KubectlExecClient).to receive(:new).with(**options).and_return(kube_client)
+    allow(TrainPlugins::K8sContainer::KubectlExecClient).to receive(:new).with(**options).and_return(kube_client)
     allow(kube_client).to receive(:execute).with("uname").and_return(shell_op)
   end
 
@@ -35,17 +36,17 @@
     end
   end
 
-  context "when there is a server error" do
-    let(:options) { { pod: "shell-demo", container_name: "nginx", namespace: "de" } }
-    let(:stdout) { "" }
-    let(:stderr) { "Error from server (NotFound): namespaces \"de\" not found\n" }
-    let(:exitstatus) { 1 }
-
-    it "should raise Connection error from server" do
-      expect { subject }.to raise_error(Train::K8s::Container::ConnectionError)
-        .with_message(/Error from server/)
-    end
-  end
+  # context "when there is a server error" do
+  #   let(:options) { { pod: "shell-demo", container_name: "nginx", namespace: "de" } }
+  #   let(:stdout) { "" }
+  #   let(:stderr) { "Error from server (NotFound): namespaces \"de\" not found\n" }
+  #   let(:exitstatus) { 1 }
+
+  #   it "should raise Connection error from server" do
+  #     expect { subject }.to raise_error(TrainPlugins::K8sContainer::ConnectionError)
+  #       .with_message(/Error from server/)
+  #   end
+  # end
 
   describe "#file" do
     let(:proc_version) { "Linux version 6.5.11-linuxkit (root@buildkitsandbox) (gcc (Alpine 12.2.1_git20220924-r10) 12.2.1 20220924, GNU ld (GNU Binutils) 2.40) #1 SMP PREEMPT Wed Dec  6 17:08:31 UTC 2023\n" }
diff --git a/spec/train/k8s/kubectl_exec_client_spec.rb b/spec/train-k8s-container/kubectl_exec_client_spec.rb
similarity index 89%
rename from spec/train/k8s/kubectl_exec_client_spec.rb
rename to spec/train-k8s-container/kubectl_exec_client_spec.rb
index 0f9cbe6..7423669 100644
--- a/spec/train/k8s/kubectl_exec_client_spec.rb
+++ b/spec/train-k8s-container/kubectl_exec_client_spec.rb
@@ -1,11 +1,12 @@
 # frozen_string_literal: true
-require_relative "../../spec_helper"
+require_relative "../spec_helper"
+require "train-k8s-container/kubectl_exec_client"
 
-RSpec.describe Train::K8s::Container::KubectlExecClient do
+RSpec.describe TrainPlugins::K8sContainer::KubectlExecClient do
   let(:shell) { double(Mixlib::ShellOut) }
   let(:pod) { "shell-demo" }
   let(:container_name) { "nginx" }
-  let(:namespace) { Train::K8s::Container::KubectlExecClient::DEFAULT_NAMESPACE }
+  let(:namespace) { TrainPlugins::K8sContainer::KubectlExecClient::DEFAULT_NAMESPACE }
   let(:shell_op) { Struct.new(:stdout, :stderr, :exitstatus) }
 
   subject { described_class.new(pod: pod, namespace: namespace, container_name: container_name) }
diff --git a/spec/train-k8s-container/transport_spec.rb b/spec/train-k8s-container/transport_spec.rb
new file mode 100644
index 0000000..d428d39
--- /dev/null
+++ b/spec/train-k8s-container/transport_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+require_relative "../spec_helper"
+require "train-k8s-container/transport"
+
+RSpec.describe TrainPlugins::K8sContainer::Transport do
+  # let(:platform_name) { Train::K8s::Container::Platform::PLATFORM_NAME }
+  let(:options) { { pod: "shell-demo", container_name: "nginx", namespace: "default" } }
+  let(:kube_client) { double(TrainPlugins::K8sContainer::KubectlExecClient) }
+  let(:shell_op) { Train::Extras::CommandResult.new(stdout, stderr, exitstatus) }
+
+  # describe ".name" do
+  #   it "registers the transport aginst the platform" do
+  #     expect(Train::Plugins.registry[platform_name]).to eq(described_class)
+  #   end
+  # end
+
+  let(:stdout) { "Linux\n" }
+  let(:stderr) { "" }
+  let(:exitstatus) { 0 }
+  before do
+    allow(TrainPlugins::K8sContainer::KubectlExecClient).to receive(:new).with(**options).and_return(kube_client)
+    allow(kube_client).to receive(:execute).with("uname").and_return(shell_op)
+  end
+
+  subject { described_class.new(options) }
+  describe "#options" do
+    it "sets the options" do
+      expect(subject.options).to include(options)
+    end
+  end
+
+  describe "#connection" do
+    it "should return the connection object" do
+      expect(subject.connection).to be_a(TrainPlugins::K8sContainer::Connection)
+    end
+  end
+
+end
+
+
diff --git a/spec/train/k8s/container/platform_spec.rb b/spec/train/k8s/container/platform_spec.rb
deleted file mode 100644
index cd0f5ac..0000000
--- a/spec/train/k8s/container/platform_spec.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-require_relative "../../../spec_helper"
-
-class TestConnection < Train::Plugins::Transport::BaseConnection
-  include Train::K8s::Container::Platform
-end
-
-RSpec.describe Train::K8s::Container::Platform do
-
-  subject { TestConnection.new }
-  it "its platform name should be `k8s-container`" do
-    expect(subject.platform.name).to eq(Train::K8s::Container::Platform::PLATFORM_NAME)
-  end
-
-  it "its platform family should be `os`" do
-    expect(subject.platform.family).to eq("unix")
-  end
-end
-
diff --git a/spec/train/k8s/container/transport_spec.rb b/spec/train/k8s/container/transport_spec.rb
deleted file mode 100644
index be85760..0000000
--- a/spec/train/k8s/container/transport_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-require_relative "../../../spec_helper"
-
-RSpec.describe Train::K8s::Container::Transport do
-  let(:platform_name) { Train::K8s::Container::Platform::PLATFORM_NAME }
-  let(:options) { { pod: "shell-demo", container_name: "nginx", namespace: "default" } }
-  let(:kube_client) { double(Train::K8s::Container::KubectlExecClient) }
-  let(:shell_op) { Train::Extras::CommandResult.new(stdout, stderr, exitstatus) }
-
-  describe ".name" do
-    it "registers the transport aginst the platform" do
-      expect(Train::Plugins.registry[platform_name]).to eq(described_class)
-    end
-  end
-
-  let(:stdout) { "Linux\n" }
-  let(:stderr) { "" }
-  let(:exitstatus) { 0 }
-  before do
-    allow(Train::K8s::Container::KubectlExecClient).to receive(:new).with(**options).and_return(kube_client)
-    allow(kube_client).to receive(:execute).with("uname").and_return(shell_op)
-  end
-
-  subject { described_class.new(options) }
-  describe "#options" do
-    it "sets the options" do
-      expect(subject.options).to include(options)
-    end
-  end
-
-  describe "#connection" do
-    it "should return the connection object" do
-      expect(subject.connection).to be_a(Train::K8s::Container::Connection)
-    end
-  end
-
-end
-
-
diff --git a/spec/train/k8s/container_spec.rb b/spec/train/k8s/container_spec.rb
deleted file mode 100644
index cd64756..0000000
--- a/spec/train/k8s/container_spec.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-require_relative "../../spec_helper"
-
-RSpec.describe Train::K8s::Container do
-  it "has a version number" do
-    expect(Train::K8s::Container::VERSION).not_to be nil
-  end
-end
diff --git a/train-k8s-container.gemspec b/train-k8s-container.gemspec
index 8f48d32..0e1cc62 100644
--- a/train-k8s-container.gemspec
+++ b/train-k8s-container.gemspec
@@ -28,14 +28,8 @@ Gem::Specification.new do |spec|
       (File.expand_path(f) == __FILE__) || f.start_with?(*%w{bin/ test/ spec/ features/ .git})
     end
   end
-  #spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
 
-  # spec.add_dependency "train", "~> 3.0"
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
+  spec.require_paths = ["lib"]
 
-  # For more information and examples about making a new gem, check out our
-  # guide at: https://bundler.io/guides/creating_gem.html
+  spec.add_dependency "train", "~> 3.0"
 end