Rearrange structure for part one
Update goal image url to reflect new location