Reorganised the test project file filters to keep related .hpp and .cpp files together.