Since pushing the configurated 'item' as an item would break stuff, so now the configs and items are split between 2 classes.
And some other cleanup stuff.