Add structure and update headers
Update links and headers