move vehicle data into seperate module