Split modules dir, and update site.pp accordingly