Clear out and move to new gem structure