first commit
first stab at a reasonable hierarchy
moved claro.pp to manifests temporarily