Refactoring to make clients app architectures look similar