Start the spec refactoring