resctructuring app
rebuild app
a