Rearchitectured app