Reorg and simiplification of app