Rearranged Gen VI test app.

Added some files to test Gen VI concepts with.