Modify build structure for cfx compliance