Changing structure of puppet directory closes #1 and closes #2