Reorg app to be component based