relegated more old entities to legacy folder