updated code and data file structure