Added some new Items, and organised the packages a bit more