restructure before_gemstone ...