[CORE] Finish structure to avoid nasty dependancies