New file structure fixed