Devel env and directory reorg