Refactor: material package