Reorg app and views