Various structure and file updates.