Added file structure back in