removed dev resources
more cleanup/reorg