Re-structure Phing