diff --git a/linspector/services/etc/__init__.py b/linspector/services/etc/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/linspector/services/http.py b/linspector/services/etc/http.py
similarity index 100%
rename from linspector/services/http.py
rename to linspector/services/etc/http.py
diff --git a/linspector/services/ping.py b/linspector/services/etc/ping.py
similarity index 100%
rename from linspector/services/ping.py
rename to linspector/services/etc/ping.py
diff --git a/linspector/services/shell.py b/linspector/services/etc/shell.py
similarity index 100%
rename from linspector/services/shell.py
rename to linspector/services/etc/shell.py
diff --git a/linspector/services/snmpget.py b/linspector/services/etc/snmpget.py
similarity index 100%
rename from linspector/services/snmpget.py
rename to linspector/services/etc/snmpget.py
diff --git a/linspector/services/ssh.py b/linspector/services/etc/ssh.py
similarity index 99%
rename from linspector/services/ssh.py
rename to linspector/services/etc/ssh.py
index 15743c2..2589579 100644
--- a/linspector/services/ssh.py
+++ b/linspector/services/etc/ssh.py
@@ -21,14 +21,15 @@ You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
-import paramiko
 import pprint
 import os
-
 from logging import getLogger
 
+import paramiko
+
 from linspector.services.service import Service
 
+
 logger = getLogger(__name__)
 
 
diff --git a/linspector/services/tcpconnect.py b/linspector/services/etc/tcpconnect.py
similarity index 100%
rename from linspector/services/tcpconnect.py
rename to linspector/services/etc/tcpconnect.py
diff --git a/linspector/services/udpconnect.py b/linspector/services/etc/udpconnect.py
similarity index 100%
rename from linspector/services/udpconnect.py
rename to linspector/services/etc/udpconnect.py