Refactor "File" model to "Upload" and attach it to FAL, and some minor cleanups