Reorganized spec folder