Reorganized file structures; Fixed a few bugs; Added early support for material feature