Moved sample classes into sample packages and other cleanups.