Move Struct to utils