It is common and some times good strategy to separate rhythm, beat and embellishments into different classes/ practices on music exploration, in order to dedicate the necessary time to each of them. Sometimes they may come together in a musicality class where choreography is used to explore music textures and qualities or to work on the skill of building a choreography.
What I would like to suggest to you is that you see all these elements as ways to explore the music, as ways to make a map of the song so that you can move and express yourself through it with more ease.
Read more here: https://bautanz.com/2021/05/26/rhythm-beat-and-embellishments-music-exploration/