Some reorganization of files.js