Move shelf contents to includes