big code reorg : incubator, advance on offirmo_app