Code compartmentalization

Currently, each function has its own code to gather which files should be returned. This leads to a lot of duplicate lines