Added test_struct file to test class reorg