Cleans up stray whitespace/newlines
Reorganizes spec files