Moved the XML to the proper place and modified the Factory to read all the material definitions