Added basic ingots, and reorganized IDs / component order