diff --git a/include/pidfile.php b/include/pidfile.php
deleted file mode 100644
index 7157a6e591..0000000000
--- a/include/pidfile.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-class pidfile {
-	private $_file;
-	private $_running;
-
-	public function __construct($dir, $name) {
-		$this->_file = "$dir/$name.pid";
-
-		if (file_exists($this->_file)) {
-			$pid = trim(@file_get_contents($this->_file));
-			if (($pid != "") && posix_kill($pid, 0)) {
-				$this->_running = true;
-			}
-		}
-
-		if (! $this->_running) {
-			$pid = getmypid();
-			file_put_contents($this->_file, $pid);
-		}
-	}
-
-	public function __destruct() {
-		if ((! $this->_running) && file_exists($this->_file)) {
-			@unlink($this->_file);
-		}
-	}
-
-	public function is_already_running() {
-		return $this->_running;
-	}
-
-	public function running_time() {
-		return(time() - @filectime($this->_file));
-	}
-
-	public function kill() {
-		if (file_exists($this->_file))
-			return(posix_kill(file_get_contents($this->_file), SIGTERM));
-	}
-}
diff --git a/src/Util/Pidfile.php b/src/Util/Pidfile.php
new file mode 100644
index 0000000000..a5d1171e7b
--- /dev/null
+++ b/src/Util/Pidfile.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @file src/Util/Pidfile.php
+ */
+namespace Friendica\Util;
+
+/**
+ * @brief Pidfile class
+ */
+class Pidfile
+{
+	private $file;
+	private $running;
+
+	/**
+	 * @param string $dir  path
+	 * @param string $name filename
+	 * @return void
+	 */
+	public function __construct($dir, $name)
+	{
+		$this->_file = "$dir/$name.pid";
+
+		if (file_exists($this->_file)) {
+			$pid = trim(@file_get_contents($this->file));
+			if (($pid != "") && posix_kill($pid, 0)) {
+				$this->running = true;
+			}
+		}
+
+		if (! $this->running) {
+			$pid = getmypid();
+			file_put_contents($this->file, $pid);
+		}
+	}
+
+	/**
+	 * @return void
+	 */
+	public function __destruct()
+	{
+		if ((! $this->running) && file_exists($this->file)) {
+			@unlink($this->file);
+		}
+	}
+
+	/**
+	 * @return boolean
+	 */
+	public static function isRunning()
+	{
+		return self::$running;
+	}
+
+	/**
+	 * @return object
+	 */
+	public static function runningTime()
+	{
+		return time() - @filectime(self::$file);
+	}
+
+	/**
+	 * @return boolean
+	 */
+	public static function kill()
+	{
+		if (file_exists(self::$file)) {
+			return posix_kill(file_get_contents(self::$file), SIGTERM);
+		}
+	}
+}