Finish merging controllers for directory and file actions.