Restructure specs