Reorganize specs with Cory F to follow convention