restructured app, added deletion