Fixing event and entity packages from move in mango