Mirror the original file structure better