Restructured puppet folder structure