re-arch - adjust build conf