Software Architecture Advise