Some test data folder hierarchies refactored.
Merge branch 'master' of https://nakamura5akihito@github.com/nakamura5akihito/six-oval.git