Updated forge, rearranged packages