Restructure sanbox sample