Reorganize for phing