Removing new entity structure as it is now refactored to a dedicated module