Reverted back to puppet directory, no more submodule