splitted the node definitions up and improved them a bit; added barrel