Rest entities restructure