Cleanup
Add structure again