Added Plugins and renamed "clients" to "apps"