final patch for file structure