Changed crafter hiearchy and fixed