restructuring and a simple data endpoint