merge widget/ and samples/