examples restructre and test updates