A Single File is better than multiple files...
Removed old moduleentries