First pass at reorganizing supporting services into subdirectories.
Remove unnecessary double and leading backslashes from tests.