Restructure; added measurement log read/write