Cleaned up samples and fixed packaging issues