Move structs into seperate file