re-structured app