[RENAME] File to comply a file per model, and some cleanups.