Adding in new file structure.