Moved to allow files to be grouped