added test file, rearranged structs