Move material from Gabe's fork to correct locations