Adjusted file structure