RESTUCTURED APP