refactoring of filenames and start of custom table cells