Updates and rearrangements

Updates for requirements based on testing with Metallurgy, and
rearrangement to move UB-specific routines to the UB-specific directory