Updated forge structure

Updated forge structure