more restructuring and cleanup of some spec files