app restructured