Refactor and allow all forms file to be uploaded to directory.