updated references so everything works with the new structure