Sample projects refactored and cleanedup