Restructure for distribution & examples