Change directory structure in test directory.
Merge pull request #2 from Makman2/cppprep

Change directory structure in test directory.