Prefab element rationalisation

🚧 Under construction