diff --git a/doc/motionplus_config.html b/doc/motionplus_config.html
index cdfafb9..9244ad9 100644
--- a/doc/motionplus_config.html
+++ b/doc/motionplus_config.html
@@ -151,11 +151,11 @@ <h2><a name="Configuration_OptionsTopic"></a>  Configuration Options-Listed by T
               <td bgcolor="#edf4f9" ><a href="#pause" >pause</a> </td>
             </tr>
               <td bgcolor="#edf4f9" ><a href="#schedule_params" >schedule_params</a> </td>
+              <td bgcolor="#edf4f9" ><a href="#cleandir_params" >cleandir_params</a> </td>
               <td bgcolor="#edf4f9" ><a href="#watchdog_tmo" >watchdog_tmo</a> </td>
               <td bgcolor="#edf4f9" ><a href="#watchdog_kill" >watchdog_kill</a> </td>
             <tr>
             </tr>
-              <td bgcolor="#edf4f9" ><a href="#target_dir" >target_dir</a> </td>
               <td bgcolor="#edf4f9" ><a href="#camera" >camera</a> </td>
               <td bgcolor="#edf4f9" ><a href="#config_dir" >config_dir</a> </td>
             <tr>
@@ -895,6 +895,92 @@ <h3><a name="schedule_params"></a>schedule_params</h3>
          </ul>
         <p></p>
 
+        <h3><a name="cleandir_params"></a>cleandir_params</h3>
+        <ul>
+          <li> Values: String | Default: Not Defined</li>
+          Comma separated list of configuration parameters.  Format is: option=value,option2=value2
+        </ul>
+        <ul>
+          <p></p>
+          This parameter specifies the information used for purging older recording and pictures created by Motionplus.  This option
+          is only applicable if a database has been specified.  The default for this parameter is an empty string which means that
+          no clean directory actions will be performed.
+          <p></p>
+
+          <div>
+            <i><h4>action</h4></i>
+            String specifying either <code><small>delete</small></code> or <code><small>script</small></code>.  If the option
+            of <code><small>script</small></code> is specified, then the provided script will be executed at the specified
+            interval.  If the option of <code><small>delete</small></code> is specified, then all files that were created
+            by Motionplus will be deleted from the system according to the schedule.  The default for this
+            parameter is <code><small>delete</small></code>
+          </div>
+          <p></p>
+
+          <div>
+            <i><h4>freq</h4></i>
+            This parameter specifies the frequency that the clean directory will be run.  Valid options for this parameter
+            are <code><small>hourly</small></code>, <code><small>daily</small></code> or <code><small>weekly</small></code>.
+            The default value for this parameter is <code><small>weekly</small></code>.
+          </div>
+          <p></p>
+
+          <div>
+            <i><h4>runtime</h4></i>
+            This parameter specifies the timing for running the clean directory actions.  The format of this value
+            varies depending upon the frequency specified.
+            <ul>
+              <li><code><small>hourly</small></code> | Specify the minute of the hour using the format mm. e.g. 05 for 5 minutes past each hour</li>
+              <li><code><small>daily</small></code> | Specify the hour and minute using the format hhmm. e.g. 1420 for 2:20pm</li>
+              <li><code><small>weekly</small></code> | Specify the day, hour and minute using the format dow-hhmm. e.g. tue-1420 for Tuesdays at 2:20pm</li>
+            </ul>
+          </div>
+          <p></p>
+
+          <div>
+            <i><h4>dur_unit</h4></i>
+            This parameter specifies the unit of duration for the criteria used to select files.  Valid options for this parameter
+            are <code><small>m</small></code>, <code><small>h</small></code>,<code><small>d</small></code> or <code><small>w</small></code>. For
+            minutes, hours, days or weeks. The default value for this parameter is <code><small>d</small></code>.  As an
+            example, if the <code><small>dur_unit=d</small></code>
+            and the <code><small>dur_val=7</small></code> then all files older than 7 days would be deleted.
+          </div>
+          <p></p>
+
+          <div>
+            <i><h4>dur_val</h4></i>
+            This parameter specifies the number associated with the duration units for the criteria used to select files.
+            The default value for this parameter is <code><small>7</small></code>.  As an example, if the <code><small>dur_unit=d</small></code>
+            and the <code><small>dur_val=7</small></code> then all files older than 7 days would be deleted.
+          </div>
+          <p></p>
+
+          <div>
+            <i><h4>removedir</h4></i>
+            This parameter is a boolean that specifies whether the associated directory (only one level up) should be
+            removed if there are no longer any files in it after the clean process has run. If there are other files
+            in the directory that are not created by Motionplus, then the directory will not be removed.
+          </div>
+          <p></p>
+
+          <div>
+            <i><h4>script</h4></i>
+            This parameter specifies the full path to a script to run at the scheduled time.
+          </div>
+          <p></p>
+
+          <div>
+            <i><h4> params_file </h4></i>
+            <ul>
+              <li> Values: String | Default: Not Defined </li>
+              Full path and file name for a file containing the params listed one per line.
+            </ul>
+          </div>
+          <p></p>
+
+         </ul>
+        <p></p>
+
         <h3><a name="watchdog_tmo"></a>watchdog_tmo</h3>
         <ul>
           <li> Values: Integer | Default: 90 </li>
diff --git a/src/camera.cpp b/src/camera.cpp
index b7c6edd..3ec47fd 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -657,6 +657,7 @@ void cls_camera::init_values()
     movie_timelapse = nullptr;
     movie_extpipe = nullptr;
     draw = nullptr;
+    cleandir = nullptr;
 
     gethostname (hostname, PATH_MAX);
     hostname[PATH_MAX-1] = '\0';
@@ -746,6 +747,7 @@ void cls_camera::cleanup()
     mydelete(movie_timelapse);
     mydelete(movie_extpipe);
     mydelete(draw);
+    mydelete(cleandir);
 
     if (pipe != -1) {
         close(pipe);
@@ -759,6 +761,248 @@ void cls_camera::cleanup()
 
 }
 
+void cls_camera::init_cleandir_default()
+{
+    if ((cleandir->action != "delete") &&
+        (cleandir->action != "script")) {
+        MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO
+            ,_("Invalid clean directory action : %s")
+            ,cleandir->action.c_str());
+        cleandir->action = "";
+    }
+    if (cleandir->action == "") {
+        MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO
+            ,_("Setting default clean directory action to delete."));
+        cleandir->action = "delete";
+    }
+
+    if ((cleandir->freq != "hourly") &&
+        (cleandir->freq != "daily") &&
+        (cleandir->freq != "weekly")) {
+        MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO
+            ,_("Invalid clean directory freq : %s")
+            ,cleandir->freq.c_str());
+        cleandir->freq = "";
+    }
+    if (cleandir->freq == "") {
+        MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO
+            ,_("Setting default clean directory frequency to weekly."));
+        cleandir->freq = "weekly";
+    }
+
+    if (cleandir->runtime == "") {
+        if (cleandir->freq == "hourly") {
+            MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO
+                ,_("Setting default clean directory runtime to 15."));
+            cleandir->runtime = "15";
+        } else if (cleandir->freq == "daily") {
+            MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO
+                ,_("Setting default clean directory runtime to 0115."));
+            cleandir->runtime = "0115";
+        } else if (cleandir->freq == "weekly") {
+            MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO
+                ,_("Setting default clean directory runtime to mon-0115."));
+            cleandir->runtime = "mon-0115";
+        }
+    }
+
+    if ((cleandir->dur_unit != "m") &&
+        (cleandir->dur_unit != "h") &&
+        (cleandir->dur_unit != "d") &&
+        (cleandir->dur_unit != "w")) {
+        MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO
+            ,_("Invalid clean directory duration unit : %s")
+            ,cleandir->dur_unit.c_str());
+        cleandir->dur_unit = "";
+    }
+    if (cleandir->dur_unit == "") {
+        MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO
+            ,_("Setting default clean directory duration unit to d."));
+        cleandir->dur_unit = "d";
+    }
+
+    if ((cleandir->dur_val == 0 )) {
+        MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO
+            ,_("Invalid clean directory duration number : %d")
+            ,cleandir->dur_val);
+        cleandir->dur_val = -1;
+    }
+    if (cleandir->dur_val <= 0) {
+        MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO
+            ,_("Setting default clean directory duration value to 7."));
+        cleandir->dur_val = 7;
+    }
+}
+
+void cls_camera::init_cleandir_runtime()
+{
+    std::string ptst,punit,premove;
+    struct tm c_tm;
+    struct timespec curr_ts;
+    int p_min, p_hr, p_dow;
+
+    clock_gettime(CLOCK_REALTIME, &curr_ts);
+    localtime_r(&curr_ts.tv_sec, &c_tm);
+
+    cleandir->next_ts.tv_nsec = 0;
+    cleandir->next_ts.tv_sec = curr_ts.tv_sec;
+
+    if (cleandir->freq == "hourly") {
+        punit = "hours";
+        if (cleandir->runtime.length() < 2) {
+            p_min = -1;
+        } else {
+            p_min = mtoi(cleandir->runtime);
+        }
+        if ((p_min > 59) || (p_min < 0)) {
+            MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO
+                ,_("Invalid clean directory hourly runtime : %s")
+                ,cleandir->runtime.c_str());
+            cleandir->runtime = "";
+            p_min = 15;
+        }
+        cleandir->next_ts.tv_sec += ((p_min - c_tm.tm_min) * 60);
+        if (cleandir->next_ts.tv_sec < curr_ts.tv_sec) {
+            cleandir->next_ts.tv_sec += 3600;
+        }
+
+    } else if (cleandir->freq == "daily") {
+        punit = "days";
+        if (cleandir->runtime.length() < 4) {
+            p_min = -1;
+        } else {
+            p_hr = mtoi(cleandir->runtime.substr(0,2));
+            p_min = mtoi(cleandir->runtime.substr(2,2));
+        }
+        if ((p_min > 59) || (p_min < 0) ||
+            (p_hr > 23)  || (p_hr < 0)) {
+            MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO
+                ,_("Invalid clean directory daily runtime : %s")
+                ,cleandir->runtime.c_str());
+            cleandir->runtime = "";
+            p_min = 15;
+            p_hr = 1;
+        }
+        cleandir->next_ts.tv_sec += ((p_min - c_tm.tm_min) * 60);
+        cleandir->next_ts.tv_sec += ((p_hr - c_tm.tm_hour) * 3600);
+        if (cleandir->next_ts.tv_sec < curr_ts.tv_sec) {
+            cleandir->next_ts.tv_sec += (60 * 60 * 24);
+        }
+
+    } else if (cleandir->freq == "weekly") {
+        punit = "weeks";
+        if (cleandir->runtime.length() < 8) {
+            p_min = -1;
+        } else {
+            ptst = cleandir->runtime.substr(0,3);   /*"mon-0115"*/
+            if (ptst == "sun") {        p_dow = 0;
+            } else if (ptst == "mon") { p_dow = 1;
+            } else if (ptst == "tue") { p_dow = 2;
+            } else if (ptst == "wed") { p_dow = 3;
+            } else if (ptst == "thu") { p_dow = 4;
+            } else if (ptst == "fri") { p_dow = 5;
+            } else if (ptst == "sat") { p_dow = 6;
+            } else {                    p_dow= -1;
+            }
+            p_hr = mtoi(cleandir->runtime.substr(4,2));
+            p_min = mtoi(cleandir->runtime.substr(6,2));
+        }
+        if ((p_min > 59) || (p_min < 0) ||
+            (p_hr > 23)  || (p_hr < 0) ||
+            (p_dow == -1)) {
+            MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO
+                ,_("Invalid clean directory weekly runtime : %s")
+                ,cleandir->runtime.c_str());
+            cleandir->runtime = "";
+            p_min = 15;
+            p_hr = 1;
+            p_dow = 1;
+        }
+        cleandir->next_ts.tv_sec += ((p_min - c_tm.tm_min) * 60);
+        cleandir->next_ts.tv_sec += ((p_hr - c_tm.tm_hour) * 3600);
+        cleandir->next_ts.tv_sec += ((p_dow - c_tm.tm_wday) * 86400);
+        if (cleandir->next_ts.tv_sec < curr_ts.tv_sec) {
+            cleandir->next_ts.tv_sec += (60 * 60 * 24 * 7);
+        }
+    }
+
+    localtime_r(&cleandir->next_ts.tv_sec, &c_tm);
+    cleandir->next_ts.tv_sec -= c_tm.tm_sec;
+
+    if (cleandir->action == "delete") {
+        MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO
+            , _("Cleandir next run:%04d-%02d-%02d %02d:%02d Criteria:%d%s RemoveDir:%s")
+            ,c_tm.tm_year+1900,c_tm.tm_mon+1,c_tm.tm_mday
+            ,c_tm.tm_hour,c_tm.tm_min
+            ,cleandir->dur_val
+            ,cleandir->dur_unit.c_str()
+            ,cleandir->removedir ? "Y":"N");
+    } else {
+        MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO
+            , _("Clean directory set to run script at %04d-%02d-%02d %02d:%02d")
+            ,c_tm.tm_year+1900,c_tm.tm_mon+1,c_tm.tm_mday
+            ,c_tm.tm_hour,c_tm.tm_min);
+    }
+
+}
+
+void cls_camera::init_cleandir()
+{
+    int indx;
+    ctx_params  *params;
+    std::string  pnm, pvl;
+
+    if (cfg->cleandir_params == "") {
+        return;
+    }
+
+    params = new ctx_params;
+    util_parms_parse(params, "cleandir_params", cfg->cleandir_params);
+
+    if (params->params_cnt == 0) {
+        mydelete(params);
+        return;
+    }
+
+    cleandir = new ctx_cleandir;
+    cleandir->action = "delete";
+    cleandir->freq = "weekly";
+    cleandir->script = "";
+    cleandir->runtime = "mon-0115";
+    cleandir->removedir = false;
+    cleandir->dur_unit = "w";
+    cleandir->dur_val = 2;
+
+    for (indx=0; indx<params->params_cnt; indx++) {
+        pnm = params->params_array[indx].param_name;
+        pvl = params->params_array[indx].param_value;
+        if (pnm == "runtime") {
+            cleandir->runtime = pvl;
+        }
+        if (pnm == "freq") {
+            cleandir->freq = pvl;
+        }
+        if (pnm == "action") {
+            cleandir->action = pvl;
+        }
+        if (pnm == "script") {
+            cleandir->script = pvl;
+        }
+        if (pnm == "dur_val") {
+            cleandir->dur_val =mtoi(pvl);
+        }
+        if (pnm == "dur_unit") {
+            cleandir->dur_unit = pvl;
+        }
+        if (pnm == "removedir") {
+            cleandir->removedir = mtob(pvl);
+        }
+    }
+    init_cleandir_default();
+    init_cleandir_runtime();
+
+}
+
 void cls_camera::init_schedule()
 {
     int indx, indx1;
@@ -776,6 +1020,7 @@ void cls_camera::init_schedule()
     util_parms_parse(params, "schedule_params", cfg->schedule_params);
 
     if (params->params_cnt == 0) {
+        mydelete(params);
         return;
     }
 
@@ -938,6 +1183,8 @@ void cls_camera::init()
     movie_timelapse = new cls_movie(this, "timelapse");
     movie_extpipe = new cls_movie(this, "extpipe");
 
+    init_cleandir();
+
     init_schedule();
 
     init_areadetect();
@@ -1767,6 +2014,7 @@ cls_camera::cls_camera(cls_motapp *p_app)
     user_pause = false;
     missing_frame_counter = -1;
     schedule.clear();
+    cleandir = nullptr;
 
     info_diff_tot = 0;
     info_diff_cnt = 0;
diff --git a/src/camera.hpp b/src/camera.hpp
index edaeadd..d35e946 100644
--- a/src/camera.hpp
+++ b/src/camera.hpp
@@ -123,6 +123,17 @@ struct ctx_schedule_data {
     std::string action;
 };
 
+struct ctx_cleandir {
+    struct timespec next_ts;
+    std::string freq;
+    std::string action;
+    std::string script;
+    std::string runtime;
+    bool removedir;
+    std::string dur_unit;
+    int dur_val;
+};
+
 class cls_camera {
     public:
         cls_camera(cls_motapp *p_app);
@@ -183,6 +194,7 @@ class cls_camera {
         int         info_sdev_max;
         uint64_t    info_sdev_tot;
         std::vector<std::vector<ctx_schedule_data>> schedule;
+        ctx_cleandir    *cleandir;
 
         bool    action_snapshot;    /* Make a snapshot */
         bool    event_stop;  /* Boolean for whether to stop a event */
@@ -242,6 +254,9 @@ class cls_camera {
         void init_cam_start();
         void init_ref();
         void init_schedule();
+        void init_cleandir_runtime();
+        void init_cleandir_default();
+        void init_cleandir();
         void cleanup();
         void init();
         void areadetect();
diff --git a/src/conf.cpp b/src/conf.cpp
index e730abb..64b7dc1 100644
--- a/src/conf.cpp
+++ b/src/conf.cpp
@@ -50,6 +50,7 @@ ctx_parm config_parms[] = {
     {"device_tmo",                PARM_TYP_INT,    PARM_CAT_01, PARM_LEVEL_LIMITED },
     {"pause",                     PARM_TYP_BOOL,   PARM_CAT_01, PARM_LEVEL_LIMITED },
     {"schedule_params",           PARM_TYP_STRING, PARM_CAT_01, PARM_LEVEL_LIMITED },
+    {"cleandir_params",           PARM_TYP_STRING, PARM_CAT_01, PARM_LEVEL_LIMITED },
     {"target_dir",                PARM_TYP_STRING, PARM_CAT_01, PARM_LEVEL_ADVANCED },
     {"watchdog_tmo",              PARM_TYP_INT,    PARM_CAT_01, PARM_LEVEL_LIMITED },
     {"watchdog_kill",             PARM_TYP_INT,    PARM_CAT_01, PARM_LEVEL_LIMITED },
@@ -710,6 +711,19 @@ void cls_config::edit_schedule_params(std::string &parm, enum PARM_ACT pact)
     MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","schedule_params",_("schedule_params"));
 }
 
+void cls_config::edit_cleandir_params(std::string &parm, enum PARM_ACT pact)
+{
+    if (pact == PARM_ACT_DFLT) {
+        cleandir_params = "";
+    } else if (pact == PARM_ACT_SET) {
+        cleandir_params = parm;
+    } else if (pact == PARM_ACT_GET) {
+        parm = cleandir_params;
+    }
+    return;
+    MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO,"%s:%s","cleandir_params",_("cleandir_params"));
+}
+
 void cls_config::edit_config_dir(std::string &parm, enum PARM_ACT pact)
 {
     if (pact == PARM_ACT_DFLT) {
@@ -732,6 +746,11 @@ void cls_config::edit_target_dir(std::string &parm, enum PARM_ACT pact)
             MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO
                 , _("Invalid target_dir.  Conversion specifiers not permitted. %s")
                 , parm.c_str());
+        } else if (parm == "") {
+            target_dir = ".";
+        } else if (parm.substr(parm.length()-1,1) == "/") {
+            target_dir = parm.substr(0, parm.length()-1);
+            MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO,"Removing trailing '/' from target_dir");
         } else {
             target_dir = parm;
         }
@@ -1829,7 +1848,14 @@ void cls_config::edit_picture_filename(std::string &parm, enum PARM_ACT pact)
     if (pact == PARM_ACT_DFLT) {
         picture_filename = "%v-%Y%m%d%H%M%S-%q";
     } else if (pact == PARM_ACT_SET) {
-        picture_filename = parm;
+        if (parm == "") {
+            picture_filename = "";
+        } else if (parm.substr(0,1) == "/") {
+            picture_filename = parm.substr(1);
+            MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO,"Removing leading '/' from filename");
+        } else {
+            picture_filename = parm;
+        }
     } else if (pact == PARM_ACT_GET) {
         parm = picture_filename;
     }
@@ -1861,7 +1887,14 @@ void cls_config::edit_snapshot_filename(std::string &parm, enum PARM_ACT pact)
     if (pact == PARM_ACT_DFLT) {
         snapshot_filename = "%v-%Y%m%d%H%M%S-snapshot";
     } else if (pact == PARM_ACT_SET) {
-        snapshot_filename = parm;
+        if (parm == "") {
+            snapshot_filename = "";
+        } else if (parm.substr(0,1) == "/") {
+            snapshot_filename = parm.substr(1);
+            MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO,"Removing leading '/' from filename");
+        } else {
+            snapshot_filename = parm;
+        }
     } else if (pact == PARM_ACT_GET) {
         parm = snapshot_filename;
     }
@@ -1997,7 +2030,14 @@ void cls_config::edit_movie_filename(std::string &parm, enum PARM_ACT pact)
     if (pact == PARM_ACT_DFLT) {
         movie_filename = "%v-%Y%m%d%H%M%S";
     } else if (pact == PARM_ACT_SET) {
-        movie_filename = parm;
+        if (parm == "") {
+            movie_filename = "";
+        } else if (parm.substr(0,1) == "/") {
+            movie_filename = parm.substr(1);
+            MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO,"Removing leading '/' from filename");
+        } else {
+            movie_filename = parm;
+        }
     } else if (pact == PARM_ACT_GET) {
         parm = movie_filename;
     }
@@ -2146,7 +2186,14 @@ void cls_config::edit_timelapse_filename(std::string &parm, enum PARM_ACT pact)
     if (pact == PARM_ACT_DFLT) {
         timelapse_filename = "%Y%m%d-timelapse";
     } else if (pact == PARM_ACT_SET) {
-        timelapse_filename = parm;
+        if (parm == "") {
+            timelapse_filename = "";
+        } else if (parm.substr(0,1) == "/") {
+            timelapse_filename = parm.substr(1);
+            MOTPLS_LOG(NTC, TYPE_ALL, NO_ERRNO,"Removing leading '/' from filename");
+        } else {
+            timelapse_filename = parm;
+        }
     } else if (pact == PARM_ACT_GET) {
         parm = timelapse_filename;
     }
@@ -3088,6 +3135,7 @@ void cls_config::edit_cat01(std::string parm_nm, std::string &parm_val, enum PAR
     } else if (parm_nm == "device_tmo") {            edit_device_tmo(parm_val, pact);
     } else if (parm_nm == "pause") {                 edit_pause(parm_val, pact);
     } else if (parm_nm == "schedule_params") {       edit_schedule_params(parm_val, pact);
+    } else if (parm_nm == "cleandir_params") {       edit_cleandir_params(parm_val, pact);
     } else if (parm_nm == "target_dir") {            edit_target_dir(parm_val, pact);
     } else if (parm_nm == "watchdog_tmo") {          edit_watchdog_tmo(parm_val, pact);
     } else if (parm_nm == "watchdog_kill") {         edit_watchdog_kill(parm_val, pact);
diff --git a/src/conf.hpp b/src/conf.hpp
index 1fe0136..ce62db7 100644
--- a/src/conf.hpp
+++ b/src/conf.hpp
@@ -112,6 +112,7 @@
             int             device_tmo;
             bool            pause;
             std::string     schedule_params;
+            std::string     cleandir_params;
 
             /* Capture device configuration parameters */
             std::string     v4l2_device;
@@ -361,6 +362,7 @@
             void edit_device_tmo(std::string &parm, enum PARM_ACT pact);
             void edit_pause(std::string &parm, enum PARM_ACT pact);
             void edit_schedule_params(std::string &parm, enum PARM_ACT pact);
+            void edit_cleandir_params(std::string &parm, enum PARM_ACT pact);
             void edit_target_dir(std::string &parm, enum PARM_ACT pact);
             void edit_watchdog_kill(std::string &parm, enum PARM_ACT pact);
             void edit_watchdog_tmo(std::string &parm, enum PARM_ACT pact);
diff --git a/src/dbse.cpp b/src/dbse.cpp
index c1d80e6..9467cbc 100644
--- a/src/dbse.cpp
+++ b/src/dbse.cpp
@@ -21,7 +21,6 @@
 #include "camera.hpp"
 #include "conf.hpp"
 #include "logger.hpp"
-#include "movie.hpp"
 #include "dbse.hpp"
 
 static void *dbse_handler(void *arg)
@@ -32,95 +31,99 @@ static void *dbse_handler(void *arg)
 
 #ifdef HAVE_DBSE
 
-void cls_dbse::cols_add_itm(std::string nm, std::string typ)
+void cls_dbse::cols_vec_add(std::string nm, std::string typ)
 {
     ctx_col_item col_itm;
-
     col_itm.found = false;
     col_itm.col_nm = nm;
     col_itm.col_typ = typ;
     col_names.push_back(col_itm);
 }
 
-/* Create list of all the columns in current version */
-void cls_dbse::get_cols_list()
+void cls_dbse::cols_vec_create()
 {
     col_names.clear();
-    cols_add_itm("device_id","int");
-    cols_add_itm("movie_nm","text");
-    cols_add_itm("movie_dir","text");
-    cols_add_itm("full_nm","text");
-    cols_add_itm("movie_sz","int");
-    cols_add_itm("movie_dtl","int");
-    cols_add_itm("movie_tmc","text");
-    cols_add_itm("movie_tml","text");
-    cols_add_itm("diff_avg","int");
-    cols_add_itm("sdev_min","int");
-    cols_add_itm("sdev_max","int");
-    cols_add_itm("sdev_avg","int");
+    cols_vec_add("device_id","int");
+    cols_vec_add("file_typ","text");
+    cols_vec_add("file_nm","text");
+    cols_vec_add("file_dir","text");
+    cols_vec_add("full_nm","text");
+    cols_vec_add("file_sz","int");
+    cols_vec_add("file_dtl","int");
+    cols_vec_add("file_tmc","text");
+    cols_vec_add("file_tml","text");
+    cols_vec_add("diff_avg","int");
+    cols_vec_add("sdev_min","int");
+    cols_vec_add("sdev_max","int");
+    cols_vec_add("sdev_avg","int");
 }
 
-/* Assign default values for records from database*/
-void cls_dbse::movie_item_default()
+void cls_dbse::item_default()
 {
-    movie_item.found     = false;
-    movie_item.record_id  = -1;
-    movie_item.device_id     = -1;
-    movie_item.movie_nm = "null";
-    movie_item.movie_dir = "null";
-    movie_item.full_nm = "null";
-    movie_item.movie_sz  = 0;
-    movie_item.movie_dtl = 0;
-    movie_item.movie_tmc = "null";
-    movie_item.movie_tml = "null";
-    movie_item.diff_avg  = 0;
-    movie_item.sdev_min  = 0;
-    movie_item.sdev_max  = 0;
-    movie_item.sdev_avg  = 0;
+    file_item.found = false;
+    file_item.record_id = -1;
+    file_item.device_id = -1;
+    file_item.file_typ = "null";
+    file_item.file_nm = "null";
+    file_item.file_dir = "null";
+    file_item.full_nm = "null";
+    file_item.file_sz  = 0;
+    file_item.file_dtl = 0;
+    file_item.file_tmc = "null";
+    file_item.file_tml = "null";
+    file_item.diff_avg  = 0;
+    file_item.sdev_min  = 0;
+    file_item.sdev_max  = 0;
+    file_item.sdev_avg  = 0;
 
 }
 
 /* Assign values to rec from the database */
-void cls_dbse::movie_item_assign(std::string col_nm, std::string col_val)
+void cls_dbse::item_assign(std::string col_nm, std::string col_val)
 {
     struct stat statbuf;
 
     if (col_nm == "record_id") {
-        movie_item.record_id = mtoi(col_val);
+        file_item.record_id = mtoi(col_val);
     } else if (col_nm == "device_id") {
-        movie_item.device_id = mtoi(col_val);
-    } else if (col_nm == "movie_nm") {
-        movie_item.movie_nm = col_val;
-    } else if (col_nm == "movie_dir") {
-        movie_item.movie_dir = col_val;
+        file_item.device_id = mtoi(col_val);
+    } else if (col_nm == "file_typ") {
+        file_item.file_typ = col_val;
+    } else if (col_nm == "file_nm") {
+        file_item.file_nm = col_val;
+    } else if (col_nm == "file_dir") {
+        file_item.file_dir = col_val;
     } else if (col_nm == "full_nm") {
-        movie_item.full_nm = col_val;
-        if (stat(movie_item.full_nm.c_str(), &statbuf) == 0) {
-            movie_item.found = true;
+        file_item.full_nm = col_val;
+        if (stat(file_item.full_nm.c_str(), &statbuf) == 0) {
+            file_item.found = true;
         }
-    } else if (col_nm == "movie_sz") {
-        movie_item.movie_sz = mtoi(col_val);
-    } else if (col_nm == "movie_dtl") {
-        movie_item.movie_dtl =mtoi(col_val);
-    } else if (col_nm == "movie_tmc") {
-        movie_item.movie_tmc = col_val;
-    } else if (col_nm == "movie_tml") {
-        movie_item.movie_tml = col_val;
+    } else if (col_nm == "file_sz") {
+        file_item.file_sz = mtoi(col_val);
+    } else if (col_nm == "file_dtl") {
+        file_item.file_dtl =mtoi(col_val);
+    } else if (col_nm == "file_tmc") {
+        file_item.file_tmc = col_val;
+    } else if (col_nm == "file_tml") {
+        file_item.file_tml = col_val;
     } else if (col_nm == "diff_avg") {
-        movie_item.diff_avg = mtoi(col_val);
+        file_item.diff_avg = mtoi(col_val);
     } else if (col_nm == "sdev_min") {
-        movie_item.sdev_min = mtoi(col_val);
+        file_item.sdev_min = mtoi(col_val);
     } else if (col_nm == "sdev_max") {
-        movie_item.sdev_max = mtoi(col_val);
+        file_item.sdev_max = mtoi(col_val);
     } else if (col_nm == "sdev_avg") {
-        movie_item.sdev_avg = mtoi(col_val);
+        file_item.sdev_avg = mtoi(col_val);
     }
 }
 
 void cls_dbse::sql_motpls(std::string &sql)
 {
     std::string delimit;
-    it_movies it;
+
+    if ((is_open == false) || (finish == true)) {
+        return;
+    }
 
     sql = "";
 
@@ -151,31 +154,30 @@ void cls_dbse::sql_motpls(std::string &sql)
         }
         sql += ");";
 
-    } else if (dbse_action == DBSE_COLS_LIST) {
+    } else if ((dbse_action == DBSE_COLS_LIST) || (dbse_action == DBSE_COLS_CURRENT)) {
         sql = " select * from motionplus;";
 
-    } else if (dbse_action == DBSE_MOV_SELECT) {
-        sql  = " select * ";
-        sql += " from motionplus ";
-        sql += " where ";
-        sql += "   device_id = " + std::to_string(device_id);
-        sql += " order by ";
-        sql += "   movie_dtl, movie_tml;";
-
     }
 
 }
 
-void cls_dbse::sql_motpls(std::string &sql, std::string col_nm, std::string col_typ)
+void cls_dbse::sql_motpls(std::string &sql, std::string col_p1, std::string col_p2)
 {
+    if ((is_open == false) || (finish == true)) {
+        return;
+    }
+
     sql = "";
 
     if ((dbse_action == DBSE_COLS_ADD) &&
-        (col_nm != "") && (col_typ != "")) {
+        (col_p1 != "") && (col_p2 != "")) {
         sql = "Alter table motionplus add column ";
-        sql += col_nm + " " + col_typ + " ;";
+        sql += col_p1 + " " + col_p2 + " ;";
+    } else if ((dbse_action == DBSE_COLS_RENAME) &&
+        (col_p1 != "") && (col_p2 != "")) {
+        sql = "Alter table motionplus rename column ";
+        sql += col_p1 + " to " + col_p2 + " ;";
     }
-
 }
 
 #endif /* HAVE_DBSE */
@@ -194,9 +196,9 @@ void cls_dbse::sqlite3db_exec(std::string sql)
     int retcd;
     char *errmsg = nullptr;
 
-    if ((database_sqlite3db == nullptr) || (sql =="")) {
+    if ((finish == true) || (database_sqlite3db == nullptr) || (is_open == false)) {
         return;
-    };
+    }
 
     MOTPLS_LOG(DBG, TYPE_DB, NO_ERRNO, "Executing query");
     retcd = sqlite3_exec(database_sqlite3db
@@ -211,10 +213,9 @@ void cls_dbse::sqlite3db_exec(std::string sql)
 
 void cls_dbse::sqlite3db_cb (int arg_nb, char **arg_val, char **col_nm)
 {
-    int indx;
-    it_cols it;
+    int indx, indx2;
 
-    if (check_exit() == true) {
+    if ((finish == true) || (database_sqlite3db == nullptr) || (is_open == false)) {
         return;
     }
 
@@ -227,31 +228,39 @@ void cls_dbse::sqlite3db_cb (int arg_nb, char **arg_val, char **col_nm)
 
     } else if (dbse_action == DBSE_COLS_LIST) {
         for (indx=0; indx < arg_nb; indx++) {
-            for (it = col_names.begin(); it != col_names.end();it++) {
-                if (mystrceq(col_nm[indx], it->col_nm.c_str())) {
-                    it->found = true;
+            for (indx2=0; indx2 < col_names.size(); indx2++) {
+                if (mystrceq(col_nm[indx], col_names[indx2].col_nm.c_str())) {
+                    col_names[indx2].found = true;
                 }
             }
         }
+    } else if (dbse_action == DBSE_COLS_CURRENT) {
+        col_names.clear();
+        for (indx=0; indx < arg_nb; indx++) {
+            cols_vec_add(col_nm[indx],"");
+        }
     } else if (dbse_action == DBSE_MOV_SELECT) {
-        movie_item_default();
+        item_default();
         for (indx=0; indx < arg_nb; indx++) {
             if (arg_val[indx] != nullptr) {
-                movie_item_assign((char*)col_nm[indx], (char*)arg_val[indx]);
+                item_assign((char*)col_nm[indx], (char*)arg_val[indx]);
             }
         }
-        movielist->push_back(movie_item);
+        filelist.push_back(file_item);
     }
 }
 
-void cls_dbse::sqlite3db_cols()
+void cls_dbse::sqlite3db_cols_verify()
 {
-    int retcd;
-    it_cols it;
+    int retcd, indx;
     char *errmsg = 0;
     std::string sql;
 
-    get_cols_list();
+    if ((finish == true) || (database_sqlite3db == nullptr) || (is_open == false)) {
+        return;
+    }
+
+    cols_vec_create();
 
     dbse_action = DBSE_COLS_LIST;
     sql_motpls(sql);
@@ -264,15 +273,49 @@ void cls_dbse::sqlite3db_cols()
         return;
     }
 
-    for (it = col_names.begin(); it != col_names.end();it++) {
-        if (it->found == false) {
+    for (indx=0;indx<col_names.size();indx++) {
+        if (col_names[indx].found == false) {
             dbse_action = DBSE_COLS_ADD;
-            sql_motpls(sql, it->col_nm, it->col_typ);
+            sql_motpls(sql
+                , col_names[indx].col_nm
+                , col_names[indx].col_typ);
             sqlite3db_exec(sql.c_str());
         }
     }
 }
 
+void cls_dbse::sqlite3db_cols_rename()
+{
+    int retcd, indx;
+    char *errmsg = 0;
+    std::string sql, tmp;
+
+    if ((finish == true) || (database_sqlite3db == nullptr) || (is_open == false)) {
+        return;
+    }
+
+    dbse_action = DBSE_COLS_CURRENT;
+    sql_motpls(sql);
+    retcd = sqlite3_exec(database_sqlite3db
+        , sql.c_str(), dbse_sqlite3db_cb, this, &errmsg);
+    if (retcd != SQLITE_OK ) {
+        MOTPLS_LOG(ERR, TYPE_DB, NO_ERRNO
+            , _("Error retrieving table columns: %s"), errmsg);
+        sqlite3_free(errmsg);
+        return;
+    }
+    for (indx=0;indx<col_names.size();indx++) {
+        if (col_names[indx].col_nm.length() > 5) {
+            if (col_names[indx].col_nm.substr(0,5) == "movie") {
+                dbse_action = DBSE_COLS_RENAME;
+                tmp = "file"+col_names[indx].col_nm.substr(5);
+                sql_motpls(sql,col_names[indx].col_nm, tmp);
+                sqlite3db_exec(sql.c_str());
+            }
+        }
+    }
+}
+
 void cls_dbse::sqlite3db_init()
 {
     int retcd;
@@ -342,18 +385,21 @@ void cls_dbse::sqlite3db_init()
         }
     }
 
-    sqlite3db_cols();
+    sqlite3db_cols_rename();
+    sqlite3db_cols_verify();
 
 }
 
-void cls_dbse::sqlite3db_movielist()
+void cls_dbse::sqlite3db_filelist(std::string sql)
 {
     int retcd;
     char *errmsg  = nullptr;
-    std::string sql;
+
+    if ((finish == true) || (database_sqlite3db == nullptr) || (is_open == false)) {
+        return;
+    }
 
     dbse_action = DBSE_MOV_SELECT;
-    sql_motpls(sql);
     retcd = sqlite3_exec(database_sqlite3db, sql.c_str()
         , dbse_sqlite3db_cb, this, &errmsg);
     if (retcd != SQLITE_OK ) {
@@ -383,7 +429,7 @@ void cls_dbse::mariadb_exec (std::string sql)
 {
     int retcd;
 
-    if ((database_mariadb == nullptr) || (sql == "")) {
+    if ((finish == true) || (database_mariadb == nullptr) || (is_open == false)) {
         return;
     }
 
@@ -415,16 +461,19 @@ void cls_dbse::mariadb_exec (std::string sql)
 
 }
 
-void cls_dbse::mariadb_recs (std::string sql)
+void cls_dbse::mariadb_recs(std::string sql)
 {
-    int retcd, indx;
+    int retcd, indx, indx2;
     int qry_fields;
     MYSQL_RES *qry_result;
     MYSQL_ROW qry_row;
     MYSQL_FIELD *qry_col;
-    lst_cols dbcol_lst;
     ctx_col_item dbcol_itm;
-    it_cols it_db, it;
+    vec_cols dbcol_lst;
+
+    if ((finish == true) || (database_mariadb == nullptr) || (is_open == false)) {
+        return;
+    }
 
     retcd = mysql_query(database_mariadb, sql.c_str());
     if (retcd != 0){
@@ -466,63 +515,99 @@ void cls_dbse::mariadb_recs (std::string sql)
         }
 
     } else if (dbse_action == DBSE_COLS_LIST) {
-        for (it_db = dbcol_lst.begin();
-            it_db != dbcol_lst.end();it_db++) {
-            for (it = col_names.begin();
-                it != col_names.end();it++) {
-                if (it_db->col_nm == it->col_nm) {
-                    it->found = true;
+        for (indx=0;indx < dbcol_lst.size(); indx++) {
+            for (indx2=0;indx2<col_names.size();indx2++) {
+                if (dbcol_lst[indx].col_nm == col_names[indx2].col_nm) {
+                    col_names[indx2].found = true;
                 }
             }
         }
 
+    } else if (dbse_action == DBSE_COLS_CURRENT) {
+        col_names.clear();
+        for (indx=0;indx < dbcol_lst.size(); indx++) {
+            cols_vec_add(dbcol_lst[indx].col_nm,"");
+        }
+
     } else if (dbse_action == DBSE_MOV_SELECT) {
         while (qry_row != nullptr) {
-            if (check_exit() == true) {
+            if (finish == true) {
                 mysql_free_result(qry_result);
                 return;
             }
-            movie_item_default();
-            for (it_db = dbcol_lst.begin();
-                it_db != dbcol_lst.end();it_db++) {
-                if (qry_row[it_db->col_idx] != nullptr) {
-                    movie_item_assign(it_db->col_nm
-                        , (char*)qry_row[it_db->col_idx]);
+            item_default();
+            for (indx=0;indx<dbcol_lst.size();indx++) {
+                if (qry_row[dbcol_lst[indx].col_idx] != nullptr) {
+                    item_assign(dbcol_lst[indx].col_nm
+                        , (char*)qry_row[dbcol_lst[indx].col_idx]);
                 }
             }
-            movielist->push_back(movie_item);
+            filelist.push_back(file_item);
             qry_row = mysql_fetch_row(qry_result);
         }
     }
     mysql_free_result(qry_result);
-
 }
 
-void cls_dbse::mariadb_cols()
+void cls_dbse::mariadb_cols_verify()
 {
     std::string sql;
-    it_cols it;
+    int indx;
 
-    get_cols_list();
+    if ((finish == true) || (database_mariadb == nullptr) || (is_open == false)) {
+        return;
+    }
+
+    cols_vec_create();
 
     dbse_action = DBSE_COLS_LIST;
     sql_motpls(sql);
     mariadb_recs(sql.c_str());
 
-    for (it = col_names.begin();
-        it != col_names.end();it++) {
-        if (it->found == false) {
+    for (indx=0;indx<col_names.size();indx++) {
+        if (col_names[indx].found == false) {
             dbse_action = DBSE_COLS_ADD;
-            sql_motpls(sql,it->col_nm,it->col_typ);
+            sql_motpls(sql
+                ,col_names[indx].col_nm
+                ,col_names[indx].col_typ);
             mariadb_exec(sql.c_str());
         }
     }
 }
 
+void cls_dbse::mariadb_cols_rename()
+{
+    std::string sql, tmp;
+    int indx;
+
+    if ((finish == true) || (database_mariadb == nullptr) || (is_open == false)) {
+        return;
+    }
+
+    dbse_action = DBSE_COLS_CURRENT;
+    sql_motpls(sql);
+    mariadb_recs(sql.c_str());
+
+    for (indx=0;indx<col_names.size();indx++) {
+        if (col_names[indx].col_nm.length() > 5) {
+            if (col_names[indx].col_nm.substr(0,5) == "movie") {
+                dbse_action = DBSE_COLS_RENAME;
+                tmp = "file"+col_names[indx].col_nm.substr(5);
+                sql_motpls(sql,col_names[indx].col_nm, tmp);
+                mariadb_exec(sql.c_str());
+            }
+        }
+    }
+}
+
 void cls_dbse::mariadb_setup()
 {
     std::string sql;
 
+    if ((finish == true) || (database_mariadb == nullptr) || (is_open == false)) {
+        return;
+    }
+
     dbse_action = DBSE_TBL_CHECK;
     sql_motpls(sql);
     mariadb_recs(sql.c_str());
@@ -535,7 +620,8 @@ void cls_dbse::mariadb_setup()
         mariadb_exec(sql.c_str());
     }
 
-    mariadb_cols();
+    mariadb_cols_rename();
+    mariadb_cols_verify();
 
 }
 
@@ -603,14 +689,10 @@ void cls_dbse::mariadb_close()
     }
 }
 
-void cls_dbse::mariadb_movielist()
+void cls_dbse::mariadb_filelist(std::string sql)
 {
-    std::string sql;
-
     dbse_action = DBSE_MOV_SELECT;
-    sql_motpls(sql);
     mariadb_recs(sql.c_str());
-
 }
 
 #endif  /*HAVE_MARIADB*/
@@ -621,7 +703,7 @@ void cls_dbse::pgsqldb_exec(std::string sql)
 {
     PGresult    *res;
 
-    if ((database_pgsqldb == nullptr) || (sql == "")) {
+    if ((database_pgsqldb == nullptr) || (sql == "") || (is_open == false)) {
         return;
     }
 
@@ -671,13 +753,8 @@ void cls_dbse::pgsqldb_recs (std::string sql)
 {
     PGresult    *res;
     int indx, indx2, rows, cols;
-    it_cols it;
-
-    if (database_pgsqldb == nullptr) {
-        return;
-    }
 
-    if (check_exit() == true) {
+    if ((finish == true) || (database_pgsqldb == nullptr) || (is_open == false)) {
         return;
     }
 
@@ -704,16 +781,24 @@ void cls_dbse::pgsqldb_recs (std::string sql)
 
     } else if (dbse_action == DBSE_COLS_LIST) {
         cols = PQnfields(res);
-        for(indx = 0; indx < cols; indx++) {
-            for (it = col_names.begin();
-                it != col_names.end();it++) {
-                if (mystrceq(PQfname(res, indx), it->col_nm.c_str())) {
-                    it->found = true;
+        for(indx=0;indx<cols;indx++) {
+            for (indx2=0;indx2<col_names.size();indx2++) {
+                if (mystrceq(PQfname(res, indx)
+                    , col_names[indx2].col_nm.c_str())) {
+                    col_names[indx2].found = true;
                 }
             }
         }
         PQclear(res);
 
+    } else if (dbse_action == DBSE_COLS_CURRENT) {
+        col_names.clear();
+        cols = PQnfields(res);
+        for(indx=0;indx<cols;indx++) {
+            cols_vec_add(PQfname(res, indx),"");
+        }
+        PQclear(res);
+
     } else if (dbse_action == DBSE_MOV_SELECT) {
         if (PQresultStatus(res) != PGRES_TUPLES_OK) {
             PQclear(res);
@@ -723,49 +808,82 @@ void cls_dbse::pgsqldb_recs (std::string sql)
         cols = PQnfields(res);
         rows = PQntuples(res);
         for(indx = 0; indx < rows; indx++) {
-            if (check_exit() == true) {
+            if (finish == true) {
                 PQclear(res);
                 return;
             }
-            movie_item_default();
+            item_default();
             for (indx2 = 0; indx2 < cols; indx2++) {
                 if (PQgetvalue(res, indx, indx2) != nullptr) {
-                    movie_item_assign((char*)PQfname(res, indx2)
+                    item_assign((char*)PQfname(res, indx2)
                         , (char*)PQgetvalue(res, indx, indx2));
                 }
             }
-            movielist->push_back(movie_item);
+            filelist.push_back(file_item);
         }
         PQclear(res);
     }
-
 }
 
-void cls_dbse::pgsqldb_cols()
+void cls_dbse::pgsqldb_cols_verify()
 {
     std::string sql;
-    it_cols it;
+    int indx;
 
-    get_cols_list();
+    if ((finish == true) || (database_pgsqldb == nullptr) || (is_open == false)) {
+        return;
+    }
+
+    cols_vec_create();
 
     dbse_action = DBSE_COLS_LIST;
     sql_motpls(sql);
     pgsqldb_recs(sql.c_str());
 
-    for (it = col_names.begin();
-        it != col_names.end();it++) {
-        if (it->found == false) {
+    for (indx=0;indx<col_names.size();indx++) {
+        if (col_names[indx].found == false) {
             dbse_action = DBSE_COLS_ADD;
-            sql_motpls(sql, it->col_nm, it->col_typ);
+            sql_motpls(sql
+                , col_names[indx].col_nm
+                , col_names[indx].col_typ);
             pgsqldb_exec(sql.c_str());
         }
     }
 }
 
+void cls_dbse::pgsqldb_cols_rename()
+{
+    int indx;
+    std::string sql, tmp;
+
+    if ((finish == true) || (database_pgsqldb == nullptr) || (is_open == false)) {
+        return;
+    }
+
+    dbse_action = DBSE_COLS_CURRENT;
+    sql_motpls(sql);
+    pgsqldb_recs(sql.c_str());
+
+    for (indx=0;indx<col_names.size();indx++) {
+        if (col_names[indx].col_nm.length() > 5) {
+            if (col_names[indx].col_nm.substr(0,5) == "movie") {
+                dbse_action = DBSE_COLS_RENAME;
+                tmp = "file"+col_names[indx].col_nm.substr(5);
+                sql_motpls(sql,col_names[indx].col_nm, tmp);
+                pgsqldb_exec(sql.c_str());
+            }
+        }
+    }
+}
+
 void cls_dbse::pgsqldb_setup()
 {
     std::string sql;
 
+    if ((finish == true) || (database_pgsqldb == nullptr) || (is_open == false)) {
+        return;
+    }
+
     dbse_action = DBSE_TBL_CHECK;
     sql_motpls(sql);
     pgsqldb_recs(sql.c_str());
@@ -778,7 +896,8 @@ void cls_dbse::pgsqldb_setup()
         pgsqldb_exec(sql.c_str());
     }
 
-    pgsqldb_cols();
+    pgsqldb_cols_rename();
+    pgsqldb_cols_verify();
 
 }
 
@@ -815,14 +934,10 @@ void cls_dbse::pgsqldb_init()
         , app->cfg->database_dbname.c_str() );
 }
 
-void cls_dbse::pgsqldb_movielist()
+void cls_dbse::pgsqldb_filelist(std::string sql)
 {
-    std::string sql;
-
     dbse_action = DBSE_MOV_SELECT;
-    sql_motpls(sql);
     pgsqldb_recs(sql.c_str());
-
 }
 
 #endif  /*HAVE_PGSQL*/
@@ -859,36 +974,37 @@ bool cls_dbse::dbse_open()
     return is_open;
 }
 
-/* Get list of movies from the database*/
-void cls_dbse::movielist_get(int p_device_id, lst_movies *p_movielist)
+void cls_dbse::filelist_get(std::string sql, vec_files &p_flst)
 {
+    int indx;
     if (dbse_open() == false) {
         return;
     }
-    if (check_exit() == true) {
+    if (finish == true) {
         return;
     }
 
     pthread_mutex_lock(&mutex_dbse);
-        device_id = p_device_id;
-        movielist = p_movielist;
-        movielist->clear();
-
+        p_flst.clear();
+        filelist.clear();
         #ifdef HAVE_MARIADB
             if (app->cfg->database_type == "mariadb") {
-                mariadb_movielist();
+                mariadb_filelist(sql);
             }
         #endif
         #ifdef HAVE_PGSQLDB
             if (app->cfg->database_type == "postgresql") {
-                pgsqldb_movielist();
+                pgsqldb_filelist(sql);
             }
         #endif
         #ifdef HAVE_SQLITE3DB
             if (app->cfg->database_type == "sqlite3") {
-                sqlite3db_movielist();
+                sqlite3db_filelist(sql);
             }
         #endif
+        for (indx=0;indx<filelist.size();indx++){
+            p_flst.push_back(filelist[indx]);
+        }
     pthread_mutex_unlock(&mutex_dbse);
 
 }
@@ -967,8 +1083,8 @@ void cls_dbse::exec(cls_camera *cam, std::string fname, std::string cmd)
 
 }
 
-/* Add a record to motionplus table */
-void cls_dbse::movielist_add(cls_camera *cam, cls_movie *movie, timespec *ts1)
+void cls_dbse::filelist_add(cls_camera *cam, timespec *ts1, std::string ftyp
+    ,std::string filenm, std::string fullnm, std::string dirnm)
 {
     std::string sqlquery;
     struct stat statbuf;
@@ -986,8 +1102,7 @@ void cls_dbse::movielist_add(cls_camera *cam, cls_movie *movie, timespec *ts1)
 
     cam->watchdog = cam->cfg->watchdog_tmo;
 
-    /* Movie file times */
-    if (stat(movie->full_nm.c_str(), &statbuf) == 0) {
+    if (stat(fullnm.c_str(), &statbuf) == 0) {
         bsz = statbuf.st_size;
     } else {
         bsz = 0;
@@ -1009,12 +1124,15 @@ void cls_dbse::movielist_add(cls_camera *cam, cls_movie *movie, timespec *ts1)
     }
 
     sqlquery =  "insert into motionplus ";
-    sqlquery += " (device_id, movie_nm, movie_dir, full_nm, movie_sz, movie_dtl";
-    sqlquery += " , movie_tmc, movie_tml, diff_avg, sdev_min, sdev_max, sdev_avg)";
+    sqlquery += " (device_id, file_nm, file_typ, file_dir";
+    sqlquery += " , full_nm, file_sz, file_dtl";
+    sqlquery += " , file_tmc, file_tml, diff_avg";
+    sqlquery += " , sdev_min, sdev_max, sdev_avg)";
     sqlquery += " values ("+std::to_string(cam->cfg->device_id);
-    sqlquery += " ,'" + movie->movie_nm + "'";
-    sqlquery += " ,'" + movie->movie_dir + "'";
-    sqlquery += " ,'" + movie->full_nm + "'";
+    sqlquery += " ,'" + filenm + "'";
+    sqlquery += " ,'" + ftyp + "'";
+    sqlquery += " ,'" + dirnm + "'";
+    sqlquery += " ,'" + fullnm + "'";
     sqlquery += " ,"  + std::to_string(bsz);
     sqlquery += " ,"  + std::string(dtl);
     sqlquery += " ,'" + std::string(tmc)+ "'";
@@ -1075,31 +1193,35 @@ void cls_dbse::dbse_edits()
 
 void cls_dbse::dbse_clean()
 {
-    lst_movies mvlist;
-    it_movies it;
     int delcnt, indx;
     std::string sql, delimit;
     struct stat statbuf;
+    vec_files flst;
 
     for (indx=0;indx<app->cam_cnt;indx++) {
         if (check_exit() == true) {
             return;
         }
-        movielist_get(app->cam_list[indx]->cfg->device_id, &mvlist);
+
+        sql  = " select * from motionplus ";
+        sql += " where device_id = ";
+        sql += std::to_string(app->cam_list[indx]->cfg->device_id);
+        sql += " order by file_dtl, file_tml;";
+        filelist_get(sql, flst);
+
         delcnt = 0;
-        for (it = mvlist.begin();
-            it != mvlist.end(); it++) {
+        for (indx=0;indx<flst.size();indx++) {
             if (check_exit() == true) {
                 return;
             }
-            if (stat(it->full_nm.c_str(), &statbuf) != 0) {
+            if (stat(flst[indx].full_nm.c_str(), &statbuf) != 0) {
                 if (sql == "") {
                     sql = " delete from motionplus "
                         " where record_id in (";
                     delimit = " ";
                     delcnt = 0;
                 }
-                sql += delimit + std::to_string(it->record_id);
+                sql += delimit + std::to_string(flst[indx].record_id);
                 delimit = ",";
                 delcnt++;
             }
@@ -1132,8 +1254,7 @@ void cls_dbse::startup()
 
 bool cls_dbse::check_exit()
 {
-    if ((handler_stop == true) ||
-        (finish == true)) {
+    if ((handler_stop == true) || (finish == true)) {
         return true;
     }
     return false;
diff --git a/src/dbse.hpp b/src/dbse.hpp
index 14311a5..1f94da6 100644
--- a/src/dbse.hpp
+++ b/src/dbse.hpp
@@ -45,29 +45,31 @@ enum DBSE_ACT {
     DBSE_TBL_CREATE,
     DBSE_MOV_SELECT,
     DBSE_COLS_LIST,
+    DBSE_COLS_CURRENT,
     DBSE_COLS_ADD,
+    DBSE_COLS_RENAME,
     DBSE_END
 };
 
-/* Record structure of motionplus table */
-struct ctx_movie_item {
+/* Record structure of table */
+struct ctx_file_item {
     bool        found;      /*Bool for whether the file exists*/
     int64_t     record_id;  /*record_id*/
     int         device_id;  /*camera id */
-    std::string movie_nm;  /*Name of the movie file*/
-    std::string movie_dir; /*Directory of the movie file */
-    std::string full_nm;   /*Full name of the movie file with dir*/
-    int64_t     movie_sz;   /*Size of the movie file in bytes*/
-    int         movie_dtl;  /*Date in yyyymmdd format for the movie file*/
-    std::string movie_tmc; /*Movie time 12h format*/
-    std::string movie_tml; /*Movie time 24h format*/
+    std::string file_typ;   /*type of file (pic/movie)*/
+    std::string file_nm;    /*Name of the file*/
+    std::string file_dir;   /*Directory of the file */
+    std::string full_nm;    /*Full name of the file with dir*/
+    int64_t     file_sz;    /*Size of the file in bytes*/
+    int         file_dtl;   /*Date in yyyymmdd format for the file*/
+    std::string file_tmc;   /*File time 12h format*/
+    std::string file_tml;   /*File time 24h format*/
     int         diff_avg;   /*Average diffs for motion frames */
     int         sdev_min;   /*std dev min */
     int         sdev_max;   /*std dev max */
     int         sdev_avg;   /*std dev average */
 };
-typedef std::list<ctx_movie_item> lst_movies;
-typedef lst_movies::iterator it_movies;
+typedef std::vector<ctx_file_item> vec_files;
 
 /* Column item attributes in the motionplus table */
 struct ctx_col_item {
@@ -76,8 +78,7 @@ struct ctx_col_item {
     std::string col_typ;    /*Data type of the column*/
     int         col_idx;    /*Sequence index*/
 };
-typedef std::list<ctx_col_item> lst_cols;
-typedef lst_cols::iterator it_cols;
+typedef std::vector<ctx_col_item> vec_cols;
 
 class cls_dbse {
     public:
@@ -86,8 +87,10 @@ class cls_dbse {
         void sqlite3db_cb (int arg_nb, char **arg_val, char **col_nm);
         pthread_mutex_t     mutex_dbse;
         void exec(cls_camera *cam, std::string filename, std::string cmd);
-        void movielist_add(cls_camera *cam, cls_movie *movie, timespec *ts1);
-        void movielist_get(int p_device_id, lst_movies *p_movielist);
+        void exec_sql(std::string sql);
+        void filelist_add(cls_camera *cam, timespec *ts1, std::string ftyp
+            ,std::string filenm, std::string fullnm, std::string dirnm);
+        void filelist_get(std::string sql, vec_files &p_flst);
         bool restart;
         bool finish;
         void shutdown();
@@ -102,57 +105,58 @@ class cls_dbse {
         #ifdef HAVE_SQLITE3DB
             sqlite3 *database_sqlite3db;
             void sqlite3db_exec(std::string sql);
-            void sqlite3db_cols();
+            void sqlite3db_cols_verify();
+            void sqlite3db_cols_rename();
             void sqlite3db_init();
-            void sqlite3db_movielist();
             void sqlite3db_close();
+            void sqlite3db_filelist(std::string sql);
         #endif
         #ifdef HAVE_MARIADB
             MYSQL *database_mariadb;
-            void mariadb_exec (std::string sql);
-            void mariadb_recs (std::string sql);
-            void mariadb_cols();
+            void mariadb_exec(std::string sql);
+            void mariadb_recs(std::string sql);
+            void mariadb_cols_verify();
+            void mariadb_cols_rename();
             void mariadb_setup();
             void mariadb_init();
             void mariadb_close();
-            void mariadb_movielist();
+            void mariadb_filelist(std::string sql);
         #endif
         #ifdef HAVE_PGSQLDB
             PGconn *database_pgsqldb;
             void pgsqldb_exec(std::string sql);
-            void pgsqldb_close();
-            void pgsqldb_recs (std::string sql);
-            void pgsqldb_cols();
+            void pgsqldb_recs(std::string sql);
+            void pgsqldb_cols_verify();
+            void pgsqldb_cols_rename();
             void pgsqldb_setup();
             void pgsqldb_init();
-            void pgsqldb_movielist();
+            void pgsqldb_close();
+            void pgsqldb_filelist(std::string sql);
         #endif
         cls_motapp          *app;
         enum DBSE_ACT       dbse_action;    /* action to perform with query*/
         bool                table_ok;       /* bool of whether table exists*/
         bool                is_open;
-        lst_cols            col_names;
-        lst_movies          *movielist;
-        int                 device_id;
-        ctx_movie_item      movie_item;
+
+        vec_cols            col_names;
+        vec_files           filelist;
+        ctx_file_item       file_item;
 
         void handler_startup();
         void handler_shutdown();
         void timing();
         bool check_exit();
         void dbse_clean();
-
-        void cols_add_itm(std::string nm, std::string typ);
-        void get_cols_list();
-        void movie_item_default();
-        void movie_item_assign(std::string col_nm, std::string col_val);
-        void sql_motpls(std::string &sql);
-        void sql_motpls(std::string &sql, std::string col_nm, std::string col_typ);
-
         void dbse_edits();
         bool dbse_open();
-        void exec_sql(std::string sql);
 
+        void cols_vec_add(std::string nm, std::string typ);
+        void cols_vec_create();
+        void item_default();
+        void item_assign(std::string col_nm, std::string col_val);
+
+        void sql_motpls(std::string &sql);
+        void sql_motpls(std::string &sql, std::string col_p1, std::string col_p2);
 };
 
-#endif /* _INCLUDE_DBSE_HPP_ */
\ No newline at end of file
+#endif /* _INCLUDE_DBSE_HPP_ */
diff --git a/src/movie.cpp b/src/movie.cpp
index 198c761..6369eed 100644
--- a/src/movie.cpp
+++ b/src/movie.cpp
@@ -125,7 +125,7 @@ int cls_movie::get_oformat()
         oc->oformat = av_guess_format("mpeg2video", nullptr, nullptr);
         oc->video_codec_id = AV_CODEC_ID_MPEG2VIDEO;
         full_nm += ".mpg";
-        movie_nm += ".mpg";
+        file_nm += ".mpg";
         if (oc->oformat == nullptr) {
             MOTPLS_LOG(ERR, TYPE_ENCODER, NO_ERRNO
                 ,_("Error setting timelapse append for container %s")
@@ -139,42 +139,42 @@ int cls_movie::get_oformat()
     if (container == "mov") {
         oc->oformat = av_guess_format("mov", nullptr, nullptr);
         full_nm += ".mov";
-        movie_nm += ".mov";
+        file_nm += ".mov";
         oc->video_codec_id = AV_CODEC_ID_H264;
     }
 
     if (container == "flv") {
         oc->oformat = av_guess_format("flv", nullptr, nullptr);
         full_nm += ".flv";
-        movie_nm += ".flv";
+        file_nm += ".flv";
         oc->video_codec_id = AV_CODEC_ID_FLV1;
     }
 
     if (container == "ogg") {
         oc->oformat = av_guess_format("ogg", nullptr, nullptr);
         full_nm += ".ogg";
-        movie_nm += ".ogg";
+        file_nm += ".ogg";
         oc->video_codec_id = AV_CODEC_ID_THEORA;
     }
 
     if (container == "webm") {
         oc->oformat = av_guess_format("webm", nullptr, nullptr);
         full_nm += ".webm";
-        movie_nm += ".webm";
+        file_nm += ".webm";
         oc->video_codec_id = AV_CODEC_ID_VP8;
     }
 
     if (container == "mp4") {
         oc->oformat = av_guess_format("mp4", nullptr, nullptr);
         full_nm += ".mp4";
-        movie_nm += ".mp4";
+        file_nm += ".mp4";
         oc->video_codec_id = AV_CODEC_ID_H264;
     }
 
     if (container == "mkv") {
         oc->oformat = av_guess_format("matroska", nullptr, nullptr);
         full_nm += ".mkv";
-        movie_nm += ".mkv";
+        file_nm += ".mkv";
         oc->video_codec_id = AV_CODEC_ID_H264;
     }
 
@@ -182,7 +182,7 @@ int cls_movie::get_oformat()
         oc->video_codec_id = AV_CODEC_ID_HEVC;
         oc->oformat = av_guess_format("mp4", nullptr, nullptr);
         full_nm += ".mp4";
-        movie_nm += ".mp4";
+        file_nm += ".mp4";
         oc->video_codec_id = AV_CODEC_ID_HEVC;
     }
 
@@ -599,10 +599,6 @@ int cls_movie::set_outputfile()
         retcd = avio_open(&oc->pb, full_nm.c_str()
             , AVIO_FLAG_WRITE|AVIO_FLAG_NONBLOCK);
         if (retcd < 0) {
-            av_strerror(retcd, errstr, sizeof(errstr));
-            MOTPLS_LOG(ERR, TYPE_ENCODER, SHOW_ERRNO
-                ,_("avio_open: %s File %s")
-                , errstr, full_nm.c_str());
             if (errno == ENOENT) {
                 if (mycreate_path(full_nm.c_str()) == -1) {
                     remove(full_nm.c_str());
@@ -621,9 +617,10 @@ int cls_movie::set_outputfile()
                     return -1;
                 }
             } else {
+                av_strerror(retcd, errstr, sizeof(errstr));
                 MOTPLS_LOG(ERR, TYPE_ENCODER, SHOW_ERRNO
-                    ,_("Error opening file %s")
-                    , full_nm.c_str());
+                    ,_("avio_open: %s File %s")
+                    , errstr, full_nm.c_str());
                 remove(full_nm.c_str());
                 free_context();
                 return -1;
@@ -1279,10 +1276,12 @@ void cls_movie::stop()
                 MOTPLS_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO
                     , _("Unable to remove file %s"), full_nm.c_str());
             } else {
-                cam->app->dbse->movielist_add(cam, this, ts);
+                cam->app->dbse->filelist_add(cam, ts, "movie"
+                    , file_nm, full_nm, file_dir);
             }
         } else {
-            cam->app->dbse->movielist_add(cam, this, ts);
+            cam->app->dbse->filelist_add(cam, ts, "movie"
+                    , file_nm, full_nm, file_dir);
         }
     } else if (movie_type == "timelapse") {
         on_movie_end();
@@ -1450,13 +1449,14 @@ void cls_movie::start_norm()
 
     mystrftime(cam, tmp, sizeof(tmp), cam->cfg->movie_filename.c_str(), nullptr);
 
-    movie_nm = tmp;
-    movie_dir = cam->cfg->target_dir;
+    file_nm = tmp;
     if (container =="test") {
-        full_nm = movie_dir + "/"  + container + "_" + movie_nm;
+        full_nm = cam->cfg->target_dir + "/"  + container + "_" + file_nm;
     } else {
-        full_nm = movie_dir + "/"  + movie_nm;
+        full_nm = cam->cfg->target_dir + "/"  + file_nm;
     }
+    file_dir =full_nm.substr(0,full_nm.find_last_of("/"));
+    file_nm = full_nm.substr(file_dir.length()+1);
 
     if (cam->imgs.size_high > 0) {
         width  = cam->imgs.width_high;
@@ -1518,13 +1518,14 @@ void cls_movie::start_motion()
             , cam->cfg->movie_filename.c_str(), nullptr);
     memcpy(cam->current_image, &save_data, sizeof(ctx_image_data));
 
-    movie_nm.assign(tmp).append("m");
-    movie_dir = cam->cfg->target_dir;
+    file_nm.assign(tmp).append("m");
     if (container =="test") {
-        full_nm = movie_dir + "/"  + container + "_" + movie_nm;
+        full_nm = cam->cfg->target_dir + "/"  + container + "_" + file_nm;
     } else {
-        full_nm = movie_dir + "/"  + movie_nm;
+        full_nm = cam->cfg->target_dir + "/"  + file_nm;
     }
+    file_dir =full_nm.substr(0,full_nm.find_last_of("/"));
+    file_nm = full_nm.substr(file_dir.length()+1);
 
     pkt = nullptr;
     width  = cam->imgs.width;
@@ -1564,9 +1565,10 @@ void cls_movie::start_timelapse()
 
     mystrftime(cam, tmp, sizeof(tmp), cam->cfg->timelapse_filename.c_str(), nullptr);
 
-    movie_nm = tmp;
-    movie_dir = cam->cfg->target_dir.c_str();
-    full_nm = movie_dir + "/" + movie_nm;
+    file_nm = tmp;
+    full_nm = cam->cfg->target_dir + "/" + file_nm;
+    file_dir =full_nm.substr(0,full_nm.find_last_of("/"));
+    file_nm = full_nm.substr(file_dir.length()+1);
 
     if ((cam->imgs.size_high > 0) && (cam->movie_passthrough == false)) {
         width  = cam->imgs.width_high;
@@ -1624,18 +1626,18 @@ void cls_movie::start_extpipe()
 
     mystrftime(cam, tmp, sizeof(tmp), cam->cfg->movie_filename.c_str(), nullptr);
 
-    movie_nm = tmp;
-    movie_dir = cam->cfg->target_dir;
-
+    file_nm = tmp;
     if (cam->cfg->movie_output) {
         MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO
             , _("Requested extpipe in addition to movie_output."));
         MOTPLS_LOG(NTC, TYPE_STREAM, NO_ERRNO
             , _("Adjusting file name of extpipe output."));
-        full_nm = movie_dir + "/"  + movie_nm + "p";
+        full_nm = cam->cfg->target_dir + "/"  + file_nm + "p";
     } else {
-        full_nm = movie_dir + "/"  + movie_nm;
+        full_nm = cam->cfg->target_dir + "/"  + file_nm;
     }
+    file_dir =full_nm.substr(0,full_nm.find_last_of("/"));
+    file_nm = full_nm.substr(file_dir.length()+1);
 
     if (mycreate_path(full_nm.c_str()) == -1) {
         MOTPLS_LOG(ERR, TYPE_EVENTS, SHOW_ERRNO, _("create path failed"));
@@ -1688,8 +1690,8 @@ void cls_movie::init_vars()
     cb_cr_ts = cb_st_ts;
     cb_dur =0;
     full_nm = "";
-    movie_nm = "";
-    movie_dir = "";
+    file_nm = "";
+    file_dir = "";
 
     oc = nullptr;
     strm_video = nullptr;
diff --git a/src/movie.hpp b/src/movie.hpp
index c565fd2..bcb562f 100644
--- a/src/movie.hpp
+++ b/src/movie.hpp
@@ -40,8 +40,8 @@ class cls_movie {
         struct timespec     cb_cr_ts;    /* Time during the interrupt to determine duration since start*/
         int                 cb_dur;      /* Seconds permitted before triggering a interrupt */
         std::string         full_nm;
-        std::string         movie_nm;
-        std::string         movie_dir;
+        std::string         file_nm;
+        std::string         file_dir;
         bool                is_running;
 
     private:
diff --git a/src/picture.cpp b/src/picture.cpp
index ed0f844..512e2d3 100644
--- a/src/picture.cpp
+++ b/src/picture.cpp
@@ -42,6 +42,10 @@ void cls_picture::picname(char* fullname, std::string fmtstr
             ,_("Error creating picture file name"));
         return;
     }
+    full_nm = fullname;
+    file_dir =full_nm.substr(0,full_nm.find_last_of("/"));
+    file_nm = full_nm.substr(file_dir.length()+1);
+
 }
 
 void cls_picture::on_picture_save_command(char *fname)
@@ -68,6 +72,8 @@ void cls_picture::process_norm()
         }
         on_picture_save_command(filename);
         cam->app->dbse->exec(cam, filename, "pic_save");
+        cam->app->dbse->filelist_add(cam, &cam->current_image->imgts
+            ,"pic", file_nm, full_nm, file_dir);
     }
 }
 
@@ -80,12 +86,18 @@ void cls_picture::process_motion()
         save_norm(filename, cam->imgs.image_motion.image_norm);
         on_picture_save_command(filename);
         cam->app->dbse->exec(cam, filename, "pic_save");
+        cam->app->dbse->filelist_add(cam, &cam->imgs.image_motion.imgts
+            ,"pic", file_nm, full_nm, file_dir);
+
 
     } else if (cam->cfg->picture_output_motion == "roi") {
         picname(filename,"%s/%sr.%s", cam->cfg->picture_filename, cam->cfg->picture_type);
         save_roi(filename, cam->current_image->image_norm);
         on_picture_save_command(filename);
         cam->app->dbse->exec(cam, filename, "pic_save");
+        cam->app->dbse->filelist_add(cam, &cam->current_image->imgts
+            ,"pic", file_nm, full_nm, file_dir);
+
     }
 }
 
@@ -111,6 +123,8 @@ void cls_picture::process_snapshot()
         }
         on_picture_save_command(filename);
         cam->app->dbse->exec(cam, filename, "pic_save");
+        cam->app->dbse->filelist_add(cam, &cam->current_image->imgts
+            ,"pic", file_nm, full_nm, file_dir);
 
         /* Update symbolic link */
         picname(linkpath,"%s/%s.%s"
@@ -134,6 +148,8 @@ void cls_picture::process_snapshot()
         }
         on_picture_save_command(filename);
         cam->app->dbse->exec(cam, filename, "pic_save");
+        cam->app->dbse->filelist_add(cam, &cam->current_image->imgts
+            ,"pic", file_nm, full_nm, file_dir);
     }
 
     cam->action_snapshot = false;
@@ -162,6 +178,8 @@ void cls_picture::process_preview()
         }
         on_picture_save_command(filename);
         cam->app->dbse->exec(cam, filename, "pic_save");
+        cam->app->dbse->filelist_add(cam, &cam->imgs.image_preview.imgts
+            ,"pic", file_nm, full_nm, file_dir);
 
         /* Restore global context values. */
         cam->current_image = saved_current_image;
diff --git a/src/picture.hpp b/src/picture.hpp
index 3d80100..985155d 100644
--- a/src/picture.hpp
+++ b/src/picture.hpp
@@ -41,6 +41,10 @@ class cls_picture {
     private:
         cls_camera *cam;
 
+        std::string         full_nm;
+        std::string         file_nm;
+        std::string         file_dir;
+
         #ifdef HAVE_WEBP
             void webp_exif(WebPMux* webp_mux
                 , timespec *ts1, ctx_coord *box);
diff --git a/src/schedule.cpp b/src/schedule.cpp
index e03fd3b..d8f5eb4 100644
--- a/src/schedule.cpp
+++ b/src/schedule.cpp
@@ -23,6 +23,7 @@
 #include "logger.hpp"
 #include "camera.hpp"
 #include "netcam.hpp"
+#include "dbse.hpp"
 #include "schedule.hpp"
 
 static void *schedule_handler(void *arg)
@@ -31,16 +32,20 @@ static void *schedule_handler(void *arg)
     return nullptr;
 }
 
-void cls_schedule::check_schedule()
+void cls_schedule::schedule_cam(cls_camera *p_cam)
 {
-    int indxc, indx;
-    int cur_dy;
-    cls_camera *p_cam;
+    int indx, cur_dy;
     struct tm c_tm;
     struct timespec curr_ts;
     bool stopcam;
 
-    if ((restart == true) || (handler_stop == true)) {
+    if ((restart == true) ||
+        (handler_stop == true) ||
+        (p_cam == nullptr)) {
+        return;
+    }
+
+    if (p_cam->schedule.size() != 7) {
         return;
     }
 
@@ -48,42 +53,208 @@ void cls_schedule::check_schedule()
     localtime_r(&curr_ts.tv_sec, &c_tm);
     cur_dy = c_tm.tm_wday;
 
-    for (indxc=0;indxc<app->cam_cnt;indxc++) {
-        p_cam = app->cam_list[indxc];
-        if (p_cam->schedule.size() == 7) {
-            stopcam = false;
-            for (indx=0; indx<p_cam->schedule[cur_dy].size(); indx++) {
-                if ((p_cam->schedule[cur_dy][indx].action == "stop") &&
-                    (c_tm.tm_hour >= p_cam->schedule[cur_dy][indx].st_hr) &&
-                    (c_tm.tm_min  >= p_cam->schedule[cur_dy][indx].st_min) &&
-                    (c_tm.tm_hour <= p_cam->schedule[cur_dy][indx].en_hr) &&
-                    (c_tm.tm_min  <= p_cam->schedule[cur_dy][indx].en_min) ) {
-                    if (p_cam->schedule[cur_dy][indx].detect) {
-                        stopcam = false;
-                    } else {
-                        stopcam = true;
-                    }
-                }
+    stopcam = false;
+    for (indx=0; indx<p_cam->schedule[cur_dy].size(); indx++) {
+        if ((p_cam->schedule[cur_dy][indx].action == "stop") &&
+            (c_tm.tm_hour >= p_cam->schedule[cur_dy][indx].st_hr) &&
+            (c_tm.tm_min  >= p_cam->schedule[cur_dy][indx].st_min) &&
+            (c_tm.tm_hour <= p_cam->schedule[cur_dy][indx].en_hr) &&
+            (c_tm.tm_min  <= p_cam->schedule[cur_dy][indx].en_min) ) {
+            if (p_cam->schedule[cur_dy][indx].detect) {
+                stopcam = false;
+            } else {
+                stopcam = true;
             }
+        }
+    }
 
-            if ((stopcam == true) && (p_cam->handler_stop == false)) {
-                p_cam->event_stop = true;
-                p_cam->restart = false;
-                p_cam->handler_stop = true;
-                p_cam->finish = true;
-                if (p_cam->camera_type == CAMERA_TYPE_NETCAM) {
-                    if (p_cam->netcam != nullptr) {
-                        p_cam->netcam->idur = 0;
-                    }
-                    if (p_cam->netcam_high != nullptr) {
-                        p_cam->netcam_high->idur = 0;
-                    }
-                }
-                p_cam->handler_shutdown();
-            } else if ((stopcam == false) && (p_cam->handler_running == false)) {
-                p_cam->handler_startup();
+    if ((stopcam == true) && (p_cam->handler_stop == false)) {
+        p_cam->event_stop = true;
+        p_cam->restart = false;
+        p_cam->handler_stop = true;
+        p_cam->finish = true;
+        if (p_cam->camera_type == CAMERA_TYPE_NETCAM) {
+            if (p_cam->netcam != nullptr) {
+                p_cam->netcam->idur = 0;
+            }
+            if (p_cam->netcam_high != nullptr) {
+                p_cam->netcam_high->idur = 0;
             }
         }
+        p_cam->handler_shutdown();
+    } else if ((stopcam == false) && (p_cam->handler_running == false)) {
+        p_cam->handler_startup();
+    }
+
+}
+
+void cls_schedule::cleandir_remove_dir(std::string dirnm)
+{
+    DIR *dp;
+    dirent *ep;
+
+    if ((restart == true) || (handler_stop == true)) {
+        return;
+    }
+
+    dp = opendir(dirnm.c_str());
+    if (dp != nullptr) {
+        ep = readdir(dp);
+        while(ep != nullptr) {
+            if ((mystrne(ep->d_name,".") &&
+                 mystrne(ep->d_name,"..")) ||
+                (restart == true) ||
+                (handler_stop == true)) {
+                closedir(dp);
+                return;
+            }
+            ep = readdir(dp);
+        }
+        closedir(dp);
+        MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO
+            , _("Removing empty directory %s"),dirnm.c_str());
+        rmdir(dirnm.c_str());
+    }
+}
+
+void cls_schedule::cleandir_remove(std::string sql, bool removedir)
+{
+    vec_files flst;
+    struct stat statbuf;
+    int indx;
+
+    app->dbse->filelist_get(sql, flst);
+
+    for (indx=0;indx<flst.size();indx++) {
+        if (stat(flst[indx].full_nm.c_str(), &statbuf) == 0) {
+            MOTPLS_LOG(DBG, TYPE_ALL, NO_ERRNO
+                , _("Removing %s"),flst[indx].full_nm.c_str());
+            remove(flst[indx].full_nm.c_str());
+            sql  = " delete from motionplus ";
+            sql += " where record_id  = ";
+            sql += std::to_string(flst[indx].record_id);
+            app->dbse->exec_sql(sql);
+        }
+        if (removedir == true) {
+            cleandir_remove_dir(flst[indx].file_dir);
+        }
+        if ((restart == true) || (handler_stop == true)) {
+            return;
+        }
+    }
+}
+
+void cls_schedule::cleandir_sql(int device_id, std::string &sql, struct timespec ts)
+{
+    struct tm c_tm;
+    std::string tmp_dtl, tmp_tml;
+    char tmp[50];
+
+    localtime_r(&ts.tv_sec, &c_tm);
+
+    sprintf(tmp, "%04d%02d%02d"
+        ,c_tm.tm_year+1900,c_tm.tm_mon+1,c_tm.tm_mday);
+    tmp_dtl = tmp;
+
+    sprintf(tmp,"%02d:%02d",c_tm.tm_hour,c_tm.tm_min);
+    tmp_tml = tmp;
+
+    sql  = " select * ";
+    sql += " from motionplus ";
+    sql += " where ";
+    sql += " device_id = " + std::to_string(device_id);
+    sql += " and ((file_dtl < " + tmp_dtl + ") ";
+    sql += "   or ((file_dtl = " + tmp_dtl + ") ";
+    sql += "   and (file_tml < '" + tmp_tml + "'))) ";
+    sql += " order by ";
+    sql += "   file_dtl, file_tml;";
+
+}
+
+void cls_schedule::cleandir_run(cls_camera *p_cam)
+{
+    struct timespec test_ts;
+    int64_t cdur;
+    std::string sql;
+
+    if ((restart == true) || (handler_stop == true)) {
+        return;
+    }
+    if (p_cam->cleandir->dur_unit == "m") {
+        cdur = p_cam->cleandir->dur_val * (60);
+    } else if (p_cam->cleandir->dur_unit == "h") {
+        cdur = p_cam->cleandir->dur_val * (60 * 60);
+    } else if (p_cam->cleandir->dur_unit == "d") {
+        cdur = p_cam->cleandir->dur_val * (60 * 60 * 24);
+    } else if (p_cam->cleandir->dur_unit == "w") {
+        cdur = p_cam->cleandir->dur_val * (60 * 60 * 24 * 7);
+    } else {
+        MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO
+            , _("Invalid clean directory duration units %s")
+            ,p_cam->cleandir->dur_unit.c_str());
+        return;
+    }
+    if (cdur <= 0) {
+        MOTPLS_LOG(ERR, TYPE_ALL, NO_ERRNO
+            , _("Invalid clean directory duration %d%s")
+            , p_cam->cleandir->dur_val
+            , p_cam->cleandir->dur_unit.c_str());
+        return;
+    }
+    test_ts = p_cam->cleandir->next_ts;
+    test_ts.tv_sec -= cdur;
+
+    cleandir_sql(p_cam->cfg->device_id, sql, test_ts);
+    cleandir_remove(sql, p_cam->cleandir->removedir);
+
+}
+
+void cls_schedule::cleandir_cam(cls_camera *p_cam)
+{
+    struct tm c_tm;
+    struct timespec curr_ts;
+
+    if ((restart == true) ||
+        (handler_stop == true) ||
+        (p_cam == nullptr)) {
+        return;
+    }
+
+    if (p_cam->cleandir == nullptr) {
+        return;
+    }
+
+    clock_gettime(CLOCK_REALTIME, &curr_ts);
+
+    if (curr_ts.tv_sec >= p_cam->cleandir->next_ts.tv_sec) {
+        if (p_cam->cleandir->action == "delete") {
+            cleandir_run(p_cam);
+        } else {
+            util_exec_command(p_cam, p_cam->cleandir->script);
+            /* The dbse_clean function will eliminate any entries for deleted files*/
+        }
+        if (p_cam->cleandir->freq == "hourly") {
+            p_cam->cleandir->next_ts.tv_sec += (60 * 60);
+        } else if (p_cam->cleandir->freq == "daily") {
+            p_cam->cleandir->next_ts.tv_sec += (60 * 60 * 24);
+        } else if (p_cam->cleandir->freq == "weekly") {
+            p_cam->cleandir->next_ts.tv_sec += (60 * 60 * 24 * 7);
+        }
+        localtime_r(&p_cam->cleandir->next_ts.tv_sec, &c_tm);
+        if (p_cam->cleandir->action == "delete") {
+            MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO
+                , _("Cleandir next run:%04d-%02d-%02d %02d:%02d Criteria:%d%s RemoveDir:%s")
+                ,c_tm.tm_year+1900,c_tm.tm_mon+1,c_tm.tm_mday
+                ,c_tm.tm_hour,c_tm.tm_min
+                ,p_cam->cleandir->dur_val
+                ,p_cam->cleandir->dur_unit.c_str()
+                ,p_cam->cleandir->removedir ? "Y":"N");
+        } else {
+            MOTPLS_LOG(INF, TYPE_ALL, NO_ERRNO
+                , _("Clean directory set to run script at %04d-%02d-%02d %02d:%02d")
+                ,c_tm.tm_year+1900,c_tm.tm_mon+1,c_tm.tm_mday
+                ,c_tm.tm_hour,c_tm.tm_min);
+        }
     }
 }
 
@@ -100,10 +271,17 @@ void cls_schedule::timing()
 
 void cls_schedule::handler()
 {
+    int indx;
+
     mythreadname_set("sh", 0, "schedule");
 
     while (handler_stop == false) {
-        check_schedule();
+        for (indx=0; indx<app->cam_cnt; indx++) {
+            schedule_cam(app->cam_list[indx]);
+        }
+        for (indx=0; indx<app->cam_cnt; indx++) {
+            cleandir_cam(app->cam_list[indx]);
+        }
         timing();
     }
 
diff --git a/src/schedule.hpp b/src/schedule.hpp
index 050bb63..4d198fb 100644
--- a/src/schedule.hpp
+++ b/src/schedule.hpp
@@ -40,7 +40,12 @@ class cls_schedule {
         void handler_startup();
         void handler_shutdown();
         void timing();
-        void check_schedule();
+        void cleandir_cam(cls_camera *p_cam);
+        void cleandir_run(cls_camera *p_cam);
+        void cleandir_remove(std::string sql, bool removedir);
+        void cleandir_remove_dir(std::string dirnm);
+        void cleandir_sql(int device_id, std::string &sql, struct timespec ts);
+        void schedule_cam(cls_camera *p_cam);
 
 };
 
diff --git a/src/util.cpp b/src/util.cpp
index 58a867c..7286566 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -648,6 +648,38 @@ void util_exec_command(cls_camera *cam, const char *command, const char *filenam
         ,_("Executing external command '%s'"), stamp);
 }
 
+void util_exec_command(cls_camera *cam, std::string cmd)
+{
+    std::string dst;
+    int pid;
+
+    mystrftime(cam, dst, cmd, "");
+
+    pid = fork();
+    if (!pid) {
+        /* Detach from parent */
+        setsid();
+
+        execl("/bin/sh", "sh", "-c", dst.c_str(), " &",(char*)NULL);
+
+        /* if above function succeeds the program never reach here */
+        MOTPLS_LOG(ALR, TYPE_EVENTS, SHOW_ERRNO
+            ,_("Unable to start external command '%s'"),dst.c_str());
+
+        exit(1);
+    }
+
+    if (pid > 0) {
+        waitpid(pid, NULL, 0);
+    } else {
+        MOTPLS_LOG(ALR, TYPE_EVENTS, SHOW_ERRNO
+            ,_("Unable to start external command '%s'"), dst.c_str());
+    }
+
+    MOTPLS_LOG(DBG, TYPE_EVENTS, NO_ERRNO
+        ,_("Executing external command '%s'"), dst.c_str());
+}
+
 void util_exec_command(cls_sound *snd, std::string cmd)
 {
     std::string dst;
diff --git a/src/util.hpp b/src/util.hpp
index a1456e4..d6ff939 100644
--- a/src/util.hpp
+++ b/src/util.hpp
@@ -81,6 +81,7 @@ struct ctx_params {
     void mystrftime(cls_sound *snd, std::string &dst, std::string fmt);
     void util_exec_command(cls_camera *cam, const char *command, const char *filename);
     void util_exec_command(cls_sound *snd, std::string cmd);
+    void util_exec_command(cls_camera *cam, std::string cmd);
 
     void mythreadname_set(const char *abbr, int threadnbr, const char *threadname);
     void mythreadname_get(char *threadname);
diff --git a/src/webu_file.cpp b/src/webu_file.cpp
index 265c475..e147346 100644
--- a/src/webu_file.cpp
+++ b/src/webu_file.cpp
@@ -40,9 +40,9 @@ void cls_webu_file::main() {
     struct stat statbuf;
     struct MHD_Response *response;
     std::string full_nm;
-    lst_movies movies;
-    it_movies  m_it;
+    vec_files flst;
     int indx;
+    std::string sql;
 
     /*If we have not fully started yet, simply return*/
     if (app->dbse == NULL) {
@@ -62,16 +62,20 @@ void cls_webu_file::main() {
         }
     }
 
-    app->dbse->movielist_get(webua->cam->cfg->device_id, &movies);
-    if (movies.size() == 0) {
+
+    sql  = " select * from motionplus ";
+    sql += " where device_id = " + std::to_string(webua->cam->cfg->device_id);
+    sql += " order by file_dtl, file_tml;";
+    app->dbse->filelist_get(sql, flst);
+    if (flst.size() == 0) {
         webua->bad_request();
         return;
     }
 
     full_nm = "";
-    for (m_it = movies.begin(); m_it != movies.end();m_it++) {
-        if (m_it->movie_nm == webua->uri_cmd2) {
-            full_nm = m_it->full_nm;
+    for (indx=0;indx<flst.size();indx++) {
+        if (flst[indx].file_nm == webua->uri_cmd2) {
+            full_nm = flst[indx].full_nm;
         }
     }
 
diff --git a/src/webu_json.cpp b/src/webu_json.cpp
index a0c003f..ed64fcc 100644
--- a/src/webu_json.cpp
+++ b/src/webu_json.cpp
@@ -249,11 +249,11 @@ void cls_webu_json::config()
 
 void cls_webu_json::movies_list()
 {
-    int indx;
+    int indx, indx2;
     std::string response;
     char fmt[PATH_MAX];
-    lst_movies movielist;
-    it_movies m_it;
+    vec_files flst;
+    std::string sql;
 
     for (indx=0;indx<webu->wb_actions->params_cnt;indx++) {
         if (webu->wb_actions->params_array[indx].param_name == "movies") {
@@ -270,47 +270,50 @@ void cls_webu_json::movies_list()
         }
     }
 
-    app->dbse->movielist_get(webua->cam->cfg->device_id, &movielist);
+    sql  = " select * from motionplus ";
+    sql += " where device_id = " + std::to_string(webua->cam->cfg->device_id);
+    sql += " order by file_dtl, file_tml;";
+    app->dbse->filelist_get(sql, flst);
 
     webua->resp_page += "{";
     indx = 0;
-    for (m_it = movielist.begin(); m_it != movielist.end(); m_it++){
-        if (m_it->found == true) {
-            if ((m_it->movie_sz/1000) < 1000) {
+    for (indx2=0;indx2<flst.size();indx2++){
+        if (flst[indx2].found == true) {
+            if ((flst[indx2].file_sz/1000) < 1000) {
                 snprintf(fmt,PATH_MAX,"%.1fKB"
-                    ,((double)m_it->movie_sz/1000));
-            } else if ((m_it->movie_sz/1000000) < 1000) {
+                    ,((double)flst[indx2].file_sz/1000));
+            } else if ((flst[indx2].file_sz/1000000) < 1000) {
                 snprintf(fmt,PATH_MAX,"%.1fMB"
-                    ,((double)m_it->movie_sz/1000000));
+                    ,((double)flst[indx2].file_sz/1000000));
             } else {
                 snprintf(fmt,PATH_MAX,"%.1fGB"
-                    ,((double)m_it->movie_sz/1000000000));
+                    ,((double)flst[indx2].file_sz/1000000000));
             }
             webua->resp_page += "\""+ std::to_string(indx) + "\":";
 
             webua->resp_page += "{\"name\": \"";
-            webua->resp_page += escstr(m_it->movie_nm) + "\"";
+            webua->resp_page += escstr(flst[indx2].file_nm) + "\"";
 
             webua->resp_page += ",\"size\": \"";
             webua->resp_page += std::string(fmt) + "\"";
 
             webua->resp_page += ",\"date\": \"";
-            webua->resp_page += std::to_string(m_it->movie_dtl) + "\"";
+            webua->resp_page += std::to_string(flst[indx2].file_dtl) + "\"";
 
             webua->resp_page += ",\"time\": \"";
-            webua->resp_page += m_it->movie_tmc + "\"";
+            webua->resp_page += flst[indx2].file_tmc + "\"";
 
             webua->resp_page += ",\"diff_avg\": \"";
-            webua->resp_page += std::to_string(m_it->diff_avg) + "\"";
+            webua->resp_page += std::to_string(flst[indx2].diff_avg) + "\"";
 
             webua->resp_page += ",\"sdev_min\": \"";
-            webua->resp_page += std::to_string(m_it->sdev_min) + "\"";
+            webua->resp_page += std::to_string(flst[indx2].sdev_min) + "\"";
 
             webua->resp_page += ",\"sdev_max\": \"";
-            webua->resp_page += std::to_string(m_it->sdev_max) + "\"";
+            webua->resp_page += std::to_string(flst[indx2].sdev_max) + "\"";
 
             webua->resp_page += ",\"sdev_avg\": \"";
-            webua->resp_page += std::to_string(m_it->sdev_avg) + "\"";
+            webua->resp_page += std::to_string(flst[indx2].sdev_avg) + "\"";
 
             webua->resp_page += "}";
             webua->resp_page += ",";