fixed missing struct declaration due to import move