Updates to move files into directories.  Starting the split of the conf file into separate parts.