Simplify build data structure by flattening out data