Move shuffle to another package
Rename web files
Add shuffle as dependency
Fix tests