Orgenising Suggestions

so i am currently updating my datapack from 1.20.2 to 1.21 and the old version was kinde a mess so i want to orgenise it this time any. suggestions on how i can orgenise my datapack the best?