restructurize to support 3D models intents, cleanup