Restructured the gem