Cleanup: Impl Material's Decoration and Layer inner classes in material.cpp