Restructuring POM's and Template