organized tutorial imports while trying to fix build errors