Restructure spec