remake architecture to SOA