Filled out new file structure