Reorganize specs to line up with conventions