use repo structure from @rxl feedback

thanks!