Reorder sections
Add blob samples