diff --git a/classes/User_openid.php b/plugins/OpenID/User_openid.php
similarity index 100%
rename from classes/User_openid.php
rename to plugins/OpenID/User_openid.php
diff --git a/actions/finishaddopenid.php b/plugins/OpenID/finishaddopenid.php
similarity index 100%
rename from actions/finishaddopenid.php
rename to plugins/OpenID/finishaddopenid.php
diff --git a/actions/finishopenidlogin.php b/plugins/OpenID/finishopenidlogin.php
similarity index 100%
rename from actions/finishopenidlogin.php
rename to plugins/OpenID/finishopenidlogin.php
diff --git a/lib/openid.php b/plugins/OpenID/openid.php
similarity index 100%
rename from lib/openid.php
rename to plugins/OpenID/openid.php
diff --git a/actions/openidlogin.php b/plugins/OpenID/openidlogin.php
similarity index 100%
rename from actions/openidlogin.php
rename to plugins/OpenID/openidlogin.php
diff --git a/actions/openidsettings.php b/plugins/OpenID/openidsettings.php
similarity index 100%
rename from actions/openidsettings.php
rename to plugins/OpenID/openidsettings.php
diff --git a/actions/publicxrds.php b/plugins/OpenID/publicxrds.php
similarity index 100%
rename from actions/publicxrds.php
rename to plugins/OpenID/publicxrds.php
diff --git a/actions/xrds.php b/plugins/OpenID/xrds.php
similarity index 100%
rename from actions/xrds.php
rename to plugins/OpenID/xrds.php