Restructured entities in order to match other poeticdragon modules