updated structure to work with the new codr