We should move a lot of the approver logic into ApprovalFiles, it will allow to use the same method names for folder and regular files

[tyrcho]