changed modules to work with new data structure