Converting to new file structure