Sid/material refactor

covers #1

refactor the material to material and giver material