added some more item types, moved new code to temporary packages