Removed submodules and updated puppet files