Re org using latest puppet module layouts