Start to organize puppet files