Temporary restory videos thumbnails
Some refactoring