Remove unnecessary files and add pagination