diff --git a/process-info/control b/process-info/control
deleted file mode 100644
index 5155cb1..0000000
--- a/process-info/control
+++ /dev/null
@@ -1,24 +0,0 @@
-
-Plugin: process-info
- Plugin which will make deeper look to processess and their usage.
-
-Maintainer: Lukas Macura <lukas@macura.cz>
-
-Item: cpu[*]
- This item will return cpu usage of given process. In zabbix, it will be prefixed automaticaly by plugin name (processlist.cpu)
-
-Item-cmd-cpu[*]: {ZAFLIB} {PLUGINDIR}/cpu-get.sh
-
-Item: discovery
- Discovery of runing processes
-Item-cmd-discovery: {ZAFLIB} {PLUGINDIR}/proc-discovery.sh
-
-Binary-depends: echo ps awk sort uniq sed
-
-Dpkg-depends: sed 
-
-Opkg-depends: busybox
-
-Install-bin: cpu-get.sh proc-discovery.sh
-
-
diff --git a/process-info/README.md b/psx/README.md
similarity index 100%
rename from process-info/README.md
rename to psx/README.md
diff --git a/psx/control.zaf b/psx/control.zaf
new file mode 100644
index 0000000..9a010a2
--- /dev/null
+++ b/psx/control.zaf
@@ -0,0 +1,36 @@
+
+Plugin: psx
+Description::
+ Plugin which will make deeper look to processess and their usage.
+::
+
+Version: 0.1
+Url: https://raw.githubusercontent.com/limosek/zaf-plugins/master/psx
+Web: https://github.com/limosek/zaf-plugins/
+Maintainer: Lukas Macura <lukas@macura.cz>
+Install-bin: cpu-get.sh proc-discovery.sh
+
+# Dependencies
+Depends-dpkg: dash curl
+Depens-opkg: busybox curl
+Depends-rpm: curl
+Depends-bin: curl ps
+
+Item cpu:
+Parameters: process_name
+Description::
+ This item will return cpu usage of given process.
+ In zabbix, it will be prefixed automaticaly by plugin name (psx.cpu)
+::
+Cmd: {PLUGINDIR}/cpu-get.sh $1
+/Item
+
+Item discovery:
+Description::
+ Discovery of runing processes
+::
+Cmd: {PLUGINDIR}/proc-discovery.sh
+/Item
+
+
+
diff --git a/process-info/cpu-get.sh b/psx/cpu-get.sh
similarity index 100%
rename from process-info/cpu-get.sh
rename to psx/cpu-get.sh
diff --git a/process-info/proc-discovery.sh b/psx/proc-discovery.sh
similarity index 100%
rename from process-info/proc-discovery.sh
rename to psx/proc-discovery.sh
diff --git a/process-info/template.xml b/psx/template.xml
similarity index 100%
rename from process-info/template.xml
rename to psx/template.xml
diff --git a/zaf/control.zaf b/zaf/control.zaf
index 41a6f3d..6520817 100644
--- a/zaf/control.zaf
+++ b/zaf/control.zaf
@@ -11,71 +11,49 @@ Description::
 Version: 0.3
 
 # Url of plugin location to be able to update plugin
-Url: https://raw.githubusercontent.com/limosek/zaf/master/
+Url: https://raw.githubusercontent.com/limosek/zaf-plugins/master/zaf
 
 # Homepage of plugin
-Web: https://github.com/limosek/zaf/
+Web: https://github.com/limosek/zaf-plugins/
 
 # Maintainer
 Maintainer: Lukas Macura <lukas@macura.cz>
 
-# You can specify dependencies
+# Dependencies
 Depends-dpkg: dash curl
 Depens-opkg: busybox curl
 Depends-rpm: curl
 Depends-bin: curl
 
-# Which files to install. All files will be saved to plugin directory (without path)
-#Install-bin: bin/test.sh
-
-#Install-script::
-# cd {PLUGINDIR};
-# echo aaa
-#::
-
-#Install-cmd: {PLUGINDIR}/install.sh
-
-# List of items. Each item can have more control options.
-# Item configuration ends by white line.
-Item version:
-# Item decription
+Item framework_version:
 Description::
      Returns version of zaf installed.
 ::
-
 # If item is function defined in shared library, use Function:
 Function: zaf_version
-
-# If you want to specify script directly here, use Script:
-#Script::
-##!/bin/sh
-#. {ZAFLIBDIR}/zaf/lib.sh
-#zaf_version
-#::
-
-# End of item declaration
 /Item
 
-# List of installed plugins as item
 Item plugins:
 Description::
  Returns installed plugins
-Description::
-
-Cmd: zaf list
+::
+Function: zaf_list_plugins
 /Item
 
 Item discovery.plugins:
 Description::
  Returns installed plugins in form suitable for zabbix discovery
-Description::
+::
 Function: zaf_discovery_plugins
 /Item
 
-Item plugin_version[*]:
+Item plugin_version:
+Parameters: plugin_name
 Description::
  Returns maintainer of plugin
-Description::
+::
+
 Function: zaf_plugin_version $1
+
 /Item