Moved all the item classes into their new Scala objects