Added shuffeling and removed file extensions