Move shuffle to a separated file