reorg while adding SOA 5 apps