move stuff around to correct gem structure