Expand STRUCTURE to include separation of core and main