Reorganize texture types around