diff --git a/examples b/examples
index 0cbb81a..2916480 160000
--- a/examples
+++ b/examples
@@ -1 +1 @@
-Subproject commit 0cbb81abdf123a7ce1ff25675f427a550e2dd59f
+Subproject commit 29164805fbb4670befd826e4a44892f00f84688f
diff --git a/src/sshare/main.py b/src/sshare/main.py
index 6523d6b..023480a 100644
--- a/src/sshare/main.py
+++ b/src/sshare/main.py
@@ -57,7 +57,7 @@ def main():
         version=f"%(prog)s version {version}",
     )
 
-    INTERNAL_PLUGIN_LOCATION = "sshare.plugins"
+    INTERNAL_PLUGIN_LOCATION = "sshare.plugins.default"
     # Load command line early and set it as the active logger
     # so that it can be used to report errors while loading and
     # configuring other loggers
diff --git a/src/sshare/plugin/plugin.py b/src/sshare/plugin.py
similarity index 98%
rename from src/sshare/plugin/plugin.py
rename to src/sshare/plugin.py
index 395b060..41abb9c 100644
--- a/src/sshare/plugin/plugin.py
+++ b/src/sshare/plugin.py
@@ -15,8 +15,8 @@
 import importlib
 import importlib.util
 
-from sshare.plugin.config import Flag
-from sshare.plugin.config import NoDefault
+from sshare.plugins.config import Flag
+from sshare.plugins.config import NoDefault
 
 class PluginManager:
     def __init__(self, types, logger, config, flags, arg_parser):
diff --git a/src/sshare/plugin/__init__.py b/src/sshare/plugin/__init__.py
deleted file mode 100644
index 60040ad..0000000
--- a/src/sshare/plugin/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is part of SSHare.
-#
-# SSHare is free software: you can redistribute it and/or modify it under the terms of
-# the GNU General Public License as published by the Free Software Foundation,
-# either version 3 of the License, or (at your option) any later version.
-#
-# SSHare is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# SSHare. If not, see <https://www.gnu.org/licenses/>.
-
-from .plugin import *
diff --git a/src/sshare/plugin/config.py b/src/sshare/plugins/config.py
similarity index 100%
rename from src/sshare/plugin/config.py
rename to src/sshare/plugins/config.py
diff --git a/src/sshare/plugins/append_type.py b/src/sshare/plugins/default/append_type.py
similarity index 93%
rename from src/sshare/plugins/append_type.py
rename to src/sshare/plugins/default/append_type.py
index 7b97012..aedcca2 100644
--- a/src/sshare/plugins/append_type.py
+++ b/src/sshare/plugins/default/append_type.py
@@ -12,8 +12,8 @@
 # You should have received a copy of the GNU General Public License along with
 # SSHare. If not, see <https://www.gnu.org/licenses/>.
 
-from sshare.plugin.source import File
-from sshare.plugin.source import Raw
+from sshare.plugins.source import File
+from sshare.plugins.source import Raw
 
 plugin_type = "name"
 
diff --git a/src/sshare/plugins/command_line.py b/src/sshare/plugins/default/command_line.py
similarity index 100%
rename from src/sshare/plugins/command_line.py
rename to src/sshare/plugins/default/command_line.py
diff --git a/src/sshare/plugins/current_time.py b/src/sshare/plugins/default/current_time.py
similarity index 94%
rename from src/sshare/plugins/current_time.py
rename to src/sshare/plugins/default/current_time.py
index 16cdd44..062ff86 100644
--- a/src/sshare/plugins/current_time.py
+++ b/src/sshare/plugins/default/current_time.py
@@ -14,8 +14,8 @@
 
 import time
 
-from sshare.plugin.config import Argument
-from sshare.plugin.source import File
+from sshare.plugins.config import Argument
+from sshare.plugins.source import File
 
 plugin_type = "name"
 
diff --git a/src/sshare/plugins/file.py b/src/sshare/plugins/default/file.py
similarity index 88%
rename from src/sshare/plugins/file.py
rename to src/sshare/plugins/default/file.py
index 12cd2c4..06ac354 100644
--- a/src/sshare/plugins/file.py
+++ b/src/sshare/plugins/default/file.py
@@ -12,9 +12,9 @@
 # You should have received a copy of the GNU General Public License along with
 # SSHare. If not, see <https://www.gnu.org/licenses/>.
 
-from sshare.plugin.config import Argument
-from sshare.plugin.config import NoDefault
-from sshare.plugin.source import File
+from sshare.plugins.config import Argument
+from sshare.plugins.config import NoDefault
+from sshare.plugins.source import File
 
 plugin_type = "source"
 
diff --git a/src/sshare/plugins/print_location.py b/src/sshare/plugins/default/print_location.py
similarity index 100%
rename from src/sshare/plugins/print_location.py
rename to src/sshare/plugins/default/print_location.py
diff --git a/src/sshare/plugins/ssh.py b/src/sshare/plugins/default/ssh.py
similarity index 94%
rename from src/sshare/plugins/ssh.py
rename to src/sshare/plugins/default/ssh.py
index 2bf71cf..e73bd20 100644
--- a/src/sshare/plugins/ssh.py
+++ b/src/sshare/plugins/default/ssh.py
@@ -15,9 +15,9 @@
 import getpass
 import subprocess
 
-from sshare.plugin.config import NoDefault
-from sshare.plugin.source import File
-from sshare.plugin.source import Raw
+from sshare.plugins.config import NoDefault
+from sshare.plugins.source import File
+from sshare.plugins.source import Raw
 
 plugin_type = "upload"
 
diff --git a/src/sshare/plugins/stdin.py b/src/sshare/plugins/default/stdin.py
similarity index 91%
rename from src/sshare/plugins/stdin.py
rename to src/sshare/plugins/default/stdin.py
index 7b219b6..df359e4 100644
--- a/src/sshare/plugins/stdin.py
+++ b/src/sshare/plugins/default/stdin.py
@@ -14,8 +14,8 @@
 
 import sys
 
-from sshare.plugin.config import Flag
-from sshare.plugin.source import Raw
+from sshare.plugins.config import Flag
+from sshare.plugins.source import Raw
 
 plugin_type = "source"
 
diff --git a/src/sshare/plugins/uri.py b/src/sshare/plugins/default/uri.py
similarity index 95%
rename from src/sshare/plugins/uri.py
rename to src/sshare/plugins/default/uri.py
index 53078b7..b6f0997 100644
--- a/src/sshare/plugins/uri.py
+++ b/src/sshare/plugins/default/uri.py
@@ -12,7 +12,7 @@
 # You should have received a copy of the GNU General Public License along with
 # SSHare. If not, see <https://www.gnu.org/licenses/>.
 
-from sshare.plugin.config import NoDefault
+from sshare.plugins.config import NoDefault
 
 plugin_type = "location"
 
diff --git a/src/sshare/plugin/source.py b/src/sshare/plugins/source.py
similarity index 100%
rename from src/sshare/plugin/source.py
rename to src/sshare/plugins/source.py
diff --git a/test_in.py b/test_in.py
deleted file mode 100755
index 572e9d1..0000000
--- a/test_in.py
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/python
-
-import sys
-
-print("=> " + sys.stdin.read())
diff --git a/test_out.py b/test_out.py
deleted file mode 100755
index f89bd5d..0000000
--- a/test_out.py
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/python
-
-for i in range(0, 5):
-    print("\033[91mHello World!")