REVERT org and move conf to devtre