change structure a bit to conform build step