Break-out some code to seperate filenames