Prep work (adding File/Fileset classes) for better functionality and better refactoring