Changed duplicate file structure