restructured app