Reorganize specs into their logical places