Use new file structure