diff --git a/plugins/ExtendedProfile/ExtendedProfilePlugin.php b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
index 127c91a543..ce1593dad5 100644
--- a/plugins/ExtendedProfile/ExtendedProfilePlugin.php
+++ b/plugins/ExtendedProfile/ExtendedProfilePlugin.php
@@ -32,12 +32,14 @@ class ExtendedProfilePlugin extends Plugin
 
     function onPluginVersion(&$versions)
     {
-        $versions[] = array('name' => 'ExtendedProfile',
-                            'version' => STATUSNET_VERSION,
-                            'author' => 'Brion Vibber, Zach Copley',
-                            'homepage' => 'http://status.net/wiki/Plugin:ExtendedProfile',
-                            'rawdescription' =>
-                            _m('UI extensions for additional profile fields.'));
+        $versions[] = array(
+            'name' => 'ExtendedProfile',
+            'version' => STATUSNET_VERSION,
+            'author' => 'Brion Vibber, Samantha Doherty, Zach Copley',
+            'homepage' => 'http://status.net/wiki/Plugin:ExtendedProfile',
+            'rawdescription' => _m(
+                'UI extensions for additional profile fields.')
+        );
 
         return true;
     }
@@ -53,22 +55,26 @@ class ExtendedProfilePlugin extends Plugin
      */
     function onAutoload($cls)
     {
-        $lower = strtolower($cls);
+        $dir = dirname(__FILE__);
 
-        switch ($lower)
+        switch (strtolower($cls))
         {
-        case 'extendedprofile':
-        case 'extendedprofilewidget':
         case 'profiledetailaction':
         case 'profiledetailsettingsaction':
-            require_once dirname(__FILE__) . '/' . $lower . '.php';
-            return false;
         case 'userautocompleteaction':
-            require_once dirname(__FILE__) . '/action/' . mb_substr($lower, 0, -6) . '.php';
+            include_once $dir . '/actions/'
+                . strtolower(mb_substr($cls, 0, -6)) . '.php';
             return false;
+            break; // Safety first!
+        case 'extendedprofile':
+        case 'extendedprofilewidget':
+            include_once $dir . '/lib/' . strtolower($cls) . '.php';
+            return false;
+            break;
         case 'profile_detail':
-            require_once dirname(__FILE__) . '/' . ucfirst($lower) . '.php';
+            include_once $dir . '/classes/' . ucfirst($cls) . '.php';
             return false;
+            break;
         default:
             return true;
         }
diff --git a/plugins/ExtendedProfile/profiledetailaction.php b/plugins/ExtendedProfile/actions/profiledetail.php
similarity index 100%
rename from plugins/ExtendedProfile/profiledetailaction.php
rename to plugins/ExtendedProfile/actions/profiledetail.php
diff --git a/plugins/ExtendedProfile/profiledetailsettingsaction.php b/plugins/ExtendedProfile/actions/profiledetailsettings.php
similarity index 98%
rename from plugins/ExtendedProfile/profiledetailsettingsaction.php
rename to plugins/ExtendedProfile/actions/profiledetailsettings.php
index 4a2045cefb..23a6ce5d65 100644
--- a/plugins/ExtendedProfile/profiledetailsettingsaction.php
+++ b/plugins/ExtendedProfile/actions/profiledetailsettings.php
@@ -139,12 +139,14 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
 
     function parseDate($fieldname, $datestr, $required = false)
     {
-        if (empty($datestr) && $required) {
-            $msg = sprintf(
-                _m('You must supply a date for "%s".'),
-                $fieldname
-            );
-            throw new Exception($msg);
+        if (empty($datestr)) {
+            if ($required) {
+                $msg = sprintf(
+                    _m('You must supply a date for "%s".'),
+                    $fieldname
+                );
+                throw new Exception($msg);
+            }
         } else {
             $ts = strtotime($datestr);
             if ($ts === false) {
diff --git a/plugins/ExtendedProfile/action/userautocomplete.php b/plugins/ExtendedProfile/actions/userautocomplete.php
similarity index 100%
rename from plugins/ExtendedProfile/action/userautocomplete.php
rename to plugins/ExtendedProfile/actions/userautocomplete.php
diff --git a/plugins/ExtendedProfile/Profile_detail.php b/plugins/ExtendedProfile/classes/Profile_detail.php
similarity index 100%
rename from plugins/ExtendedProfile/Profile_detail.php
rename to plugins/ExtendedProfile/classes/Profile_detail.php
diff --git a/plugins/ExtendedProfile/extendedprofile.php b/plugins/ExtendedProfile/lib/extendedprofile.php
similarity index 100%
rename from plugins/ExtendedProfile/extendedprofile.php
rename to plugins/ExtendedProfile/lib/extendedprofile.php
diff --git a/plugins/ExtendedProfile/extendedprofilewidget.php b/plugins/ExtendedProfile/lib/extendedprofilewidget.php
similarity index 100%
rename from plugins/ExtendedProfile/extendedprofilewidget.php
rename to plugins/ExtendedProfile/lib/extendedprofilewidget.php