moved location of struct