moved raw data to structures