As for advice, of course I don't know for sure if it's better this way, but it seems to me that you have a lot of files that are ~2kb each, have you thought about merging some of them for easier readability of the project?