Reorganize specs into a single file