More specs reorganization