Update structure
Cleanup some names.