There is no right answer to this.
If this is your hobby project, feel free to experiment with naming. If it is your company project, you may want to consult your team lead.
In Java community, we used to face similar issue, whether one should group their components by layers or by features (dzone.com/articles/package-your-classes-feature)
To me, if I am writing monolithic application, grouping by features (like what you are trying to achieve) would make sense a lot.
But if it is microservices application, I believe grouping by layer would be more practical.