file directory clean up and initial additions