restructured app organization