rearrange output to separate demo & actual library