Refractored sample files