Name Changing

Bit of folder name changing for testers to have it easier to set up the
testing environment.

You are welcome