Reorganize specs into directories