reorganizing before pushing live